diff --git a/ThirdParty/cmake-modules b/ThirdParty/cmake-modules index 0068e164eb5ab1e16c931e50094846789b49cdc0..5893e3eb3aaec104f86ba81ee90b7e9279b74c3f 160000 --- a/ThirdParty/cmake-modules +++ b/ThirdParty/cmake-modules @@ -1 +1 @@ -Subproject commit 0068e164eb5ab1e16c931e50094846789b49cdc0 +Subproject commit 5893e3eb3aaec104f86ba81ee90b7e9279b74c3f diff --git a/scripts/cmake/ConanSetup.cmake b/scripts/cmake/ConanSetup.cmake index 9e476c4ded9fd65c5c042893e59e33537dbed542..fb2e649aa001684d6b91fbfd790255ae4ef48f0b 100644 --- a/scripts/cmake/ConanSetup.cmake +++ b/scripts/cmake/ConanSetup.cmake @@ -74,6 +74,10 @@ if(OGS_BUILD_GUI) ) endif() +if(OGS_USE_NETCDF) + set(CONAN_REQUIRES ${CONAN_REQUIRES} netcdf-cxx/4.3.1@bilke/testing) +endif() + conan_check(VERSION 1.3.0) message(STATUS "Third-party libraries:") diff --git a/scripts/cmake/Find.cmake b/scripts/cmake/Find.cmake index 62b62e5b49aa8a3cfe7ddbd85631a4861ee0e678..556e6a2174d378e1b88119259ccf82fb33c88b3c 100644 --- a/scripts/cmake/Find.cmake +++ b/scripts/cmake/Find.cmake @@ -105,6 +105,12 @@ if(OGS_BUILD_GUI) endif() endif() +if(OGS_USE_NETCDF) + set(NETCDF_ROOT ${CONAN_NETCDF-C_ROOT}) + set(NETCDF_CXX_ROOT ${CONAN_NETCDF-CXX_ROOT}) + find_package(NetCDF REQUIRED) +endif() + # lapack find_package(LAPACK QUIET)