early-access version 2853

This commit is contained in:
pineappleEA
2022-07-23 03:01:36 +02:00
parent 1f2b5081b5
commit 1f111bb69c
8955 changed files with 418777 additions and 999 deletions

View File

@@ -0,0 +1,19 @@
diff --git a/CMake/HighFiveTargetDeps.cmake b/CMake/HighFiveTargetDeps.cmake
index 51bc7b2..f04bf4c 100644
--- a/CMake/HighFiveTargetDeps.cmake
+++ b/CMake/HighFiveTargetDeps.cmake
@@ -10,7 +10,13 @@ if(NOT TARGET libdeps)
if(NOT DEFINED HDF5_C_LIBRARIES)
set(HDF5_NO_FIND_PACKAGE_CONFIG_FILE TRUE) # Consistency
set(HDF5_PREFER_PARALLEL ${HIGHFIVE_PARALLEL_HDF5})
- find_package(HDF5 REQUIRED)
+ find_package(hdf5 CONFIG REQUIRED)
+ set(HIGHFIVE_PARALLEL_HDF5 ${HDF5_ENABLE_PARALLEL})
+ if(TARGET hdf5::hdf5-shared)
+ set(HDF5_C_LIBRARIES hdf5::hdf5-shared)
+ elseif(TARGET hdf5::hdf5-static)
+ set(HDF5_C_LIBRARIES hdf5::hdf5-static)
+ endif()
endif()
if(HIGHFIVE_PARALLEL_HDF5 AND NOT HDF5_IS_PARALLEL)