From f62b1de2011786aab5da66c7ee025d4e22d5403f Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Thu, 26 Nov 2020 15:29:30 +0100
Subject: [PATCH] [Conan] Update netcdf package.
---
scripts/cmake/ConanSetup.cmake | 2 +-
scripts/cmake/Find.cmake | 6 ------
2 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/scripts/cmake/ConanSetup.cmake b/scripts/cmake/ConanSetup.cmake
index 60866ba35a0..fd26e9ff982 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 65d50fb6b8d..0ff6642f60c 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()
--
GitLab