diff --git a/scripts/cmake/ConanSetup.cmake b/scripts/cmake/ConanSetup.cmake index 60866ba35a0ae8d16d4e8b2ff3e573fa992cdcc8..fd26e9ff9824623a4cc8a81b7186f1ef97092b22 100644 --- a/scripts/cmake/ConanSetup.cmake +++ b/scripts/cmake/ConanSetup.cmake @@ -112,7 +112,7 @@ if(OGS_BUILD_GUI) endif() if(OGS_USE_NETCDF) - set(CONAN_REQUIRES ${CONAN_REQUIRES} netcdf-cxx/4.3.1@bilke/testing) + set(CONAN_REQUIRES ${CONAN_REQUIRES} netcdf-cxx/4.3.1-1@bilke/testing) endif() conan_check(VERSION ${ogs.minimum_version.conan}) diff --git a/scripts/cmake/Find.cmake b/scripts/cmake/Find.cmake index 65d50fb6b8dd962be58db709b5c12128d52b20b3..0ff6642f60cdcf6ce95d6331f0cc33c88313bc67 100644 --- a/scripts/cmake/Find.cmake +++ b/scripts/cmake/Find.cmake @@ -123,12 +123,6 @@ if(OGS_USE_NETCDF) set(NETCDF_ROOT ${CONAN_NETCDF-C_ROOT}) set(NETCDF_CXX_ROOT ${CONAN_NETCDF-CXX_ROOT}) find_package(NetCDF REQUIRED) - if(OGS_USE_CONAN AND MSVC) - set(HDF5_DIR ${CONAN_HDF5_ROOT}/cmake/hdf5) - find_package(HDF5 REQUIRED COMPONENTS C HL NO_MODULE) - else() - find_package(HDF5 REQUIRED COMPONENTS C HL) - endif() add_compile_options(-DOGS_USE_NETCDF) endif()