From c06043c4c8795f7d373ea0e8a083a0d902bd049c Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Fri, 5 Apr 2019 14:56:01 +0200
Subject: [PATCH] [Conan] Added NetCDF package.
Added simplified FindNetCDF.cmake to cmake submodule.
Have not tested this with system-installed netcdf.
---
ThirdParty/cmake-modules | 2 +-
scripts/cmake/ConanSetup.cmake | 4 ++++
scripts/cmake/Find.cmake | 6 ++++++
3 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/ThirdParty/cmake-modules b/ThirdParty/cmake-modules
index 0068e164eb5..5893e3eb3aa 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 9e476c4ded9..fb2e649aa00 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 62b62e5b49a..556e6a2174d 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)
--
GitLab