Skip to content
Snippets Groups Projects
Commit 13f609fd authored by Lars Bilke's avatar Lars Bilke
Browse files

[cmake] Use Conan HDF5 when using NetCDF.

parent d02928d7
No related branches found
No related tags found
No related merge requests found
...@@ -88,7 +88,7 @@ conan_cmake_run( ...@@ -88,7 +88,7 @@ conan_cmake_run(
OPTIONS ${CONAN_OPTIONS} OPTIONS ${CONAN_OPTIONS}
BUILD ${OGS_CONAN_BUILD} BUILD ${OGS_CONAN_BUILD}
IMPORTS ${CONAN_IMPORTS} IMPORTS ${CONAN_IMPORTS}
GENERATORS virtualrunenv GENERATORS virtualrunenv cmake_find_package
BUILD_TYPE ${CONAN_BUILD_TYPE} BUILD_TYPE ${CONAN_BUILD_TYPE}
) )
......
...@@ -169,44 +169,49 @@ CPMAddPackage( ...@@ -169,44 +169,49 @@ CPMAddPackage(
OPTIONS "BUILD_SHARED_LIBS OFF" OPTIONS "BUILD_SHARED_LIBS OFF"
) )
# ZLIB is a HDF5 dependency
CPMFindPackage(
NAME ZLIB
GITHUB_REPOSITORY madler/zlib
VERSION 1.2.11
EXCLUDE_FROM_ALL YES
)
if(ZLIB_ADDED)
add_library(ZLIB::ZLIB ALIAS zlibstatic)
endif()
if(OGS_USE_MPI) if(OGS_USE_MPI)
set(_hdf5_options "HDF5_ENABLE_PARALLEL ON") set(_hdf5_options "HDF5_ENABLE_PARALLEL ON")
endif() endif()
string(REPLACE "." "_" HDF5_TAG ${ogs.minimum_version.hdf5}) string(REPLACE "." "_" HDF5_TAG ${ogs.minimum_version.hdf5})
CPMFindPackage( if(OGS_USE_NETCDF)
NAME HDF5 list(APPEND CMAKE_MODULE_PATH ${PROJECT_BINARY_DIR})
GITHUB_REPOSITORY HDFGroup/hdf5 find_package(HDF5 REQUIRED)
GIT_TAG hdf5-${HDF5_TAG} else()
VERSION ${ogs.minimum_version.hdf5} # ZLIB is a HDF5 dependency
OPTIONS "HDF5_EXTERNALLY_CONFIGURED 1" CPMFindPackage(
"HDF5_GENERATE_HEADERS OFF" NAME ZLIB
"HDF5_BUILD_TOOLS OFF" GITHUB_REPOSITORY madler/zlib
"HDF5_BUILD_EXAMPLES OFF" VERSION 1.2.11
"HDF5_BUILD_HL_LIB OFF" EXCLUDE_FROM_ALL YES
"HDF5_BUILD_FORTRAN OFF" )
"HDF5_BUILD_CPP_LIB OFF" if(ZLIB_ADDED)
"HDF5_BUILD_JAVA OFF" add_library(ZLIB::ZLIB ALIAS zlibstatic)
${_hdf5_options} endif()
EXCLUDE_FROM_ALL YES
) CPMFindPackage(
if(HDF5_ADDED) NAME HDF5
target_include_directories(hdf5-static INTERFACE ${HDF5_BINARY_DIR}) GITHUB_REPOSITORY HDFGroup/hdf5
list(APPEND DISABLE_WARNINGS_TARGETS hdf5-static) GIT_TAG hdf5-${HDF5_TAG}
set(HDF5_LIBRARIES hdf5-static) VERSION ${ogs.minimum_version.hdf5}
set(HDF5_C_INCLUDE_DIR ${HDF5_SOURCE_DIR}) OPTIONS "HDF5_EXTERNALLY_CONFIGURED 1"
set(HDF5_INCLUDE_DIR ${HDF5_SOURCE_DIR}) "HDF5_GENERATE_HEADERS OFF"
"HDF5_BUILD_TOOLS OFF"
"HDF5_BUILD_EXAMPLES OFF"
"HDF5_BUILD_HL_LIB OFF"
"HDF5_BUILD_FORTRAN OFF"
"HDF5_BUILD_CPP_LIB OFF"
"HDF5_BUILD_JAVA OFF"
${_hdf5_options}
EXCLUDE_FROM_ALL YES
)
if(HDF5_ADDED)
target_include_directories(hdf5-static INTERFACE ${HDF5_BINARY_DIR})
list(APPEND DISABLE_WARNINGS_TARGETS hdf5-static)
set(HDF5_LIBRARIES hdf5-static)
set(HDF5_C_INCLUDE_DIR ${HDF5_SOURCE_DIR})
set(HDF5_INCLUDE_DIR ${HDF5_SOURCE_DIR})
endif()
endif() endif()
set(XDMF_LIBNAME OgsXdmf CACHE STRING "") set(XDMF_LIBNAME OgsXdmf CACHE STRING "")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment