mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-27 20:21:38 +08:00
8f8f7168ee
* [cmake] update to 3.19.0 * update vmss * [cmake] update to 3.19.1 * [solid3] Fix configure error, fix static definition * [flann] Add feature hdf5 and fix it * [highfive] Fix dependency hdf5 * [simage] Fix configure error * [aws-c-common] Fix configure error * [cmake] Update to 3.19.2 * Revert changes about cmake bug * [VMSS] Update cmake path on Windows * [cmake] Update cmake hash * [minc] Fix dependency hdf5 * [cmake] Update cmake package name and path on MacOS Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
20 lines
742 B
Diff
20 lines
742 B
Diff
diff --git a/CMake/HighFiveTargetDeps.cmake b/CMake/HighFiveTargetDeps.cmake
|
|
index f76e1d3..06ac647 100644
|
|
--- a/CMake/HighFiveTargetDeps.cmake
|
|
+++ b/CMake/HighFiveTargetDeps.cmake
|
|
@@ -8,7 +8,13 @@ add_library(libdeps INTERFACE)
|
|
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)
|