Commit 2e0600f1 authored by Lars Bilke's avatar Lars Bilke

Merge branch 'fix-netcdf' into 'master'

[Conan] Update netcdf package.

See merge request ogs/ogs!3276
parents ff5a283b f62b1de2
......@@ -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})
......
......@@ -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()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment