mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-21 21:50:17 +08:00
23eadeaedc
* [hdf5] Update HDF5 to 1.12 and use github live-clones instead of binary download * [hdf5] bump control * [hdf5] fix szip and typo about linkage * [hdf5] add missing package namespace.... they somehow missed to set it? * [hdf5] retry without " * [field3d] fix regression and update. Remove windows as unsupported since the cmakelists tries to support windows * fix typo * remove ws Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * linebreak first patch Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * ws change Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * [field3d] update copying installation * [hdf5] use official github repo * clean baseline Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
32 lines
1.7 KiB
Diff
32 lines
1.7 KiB
Diff
diff --git a/config/cmake/hdf5-config.cmake.in b/config/cmake/hdf5-config.cmake.in
|
|
index b5a12a650..a8cbacb1c 100644
|
|
--- a/config/cmake/hdf5-config.cmake.in
|
|
+++ b/config/cmake/hdf5-config.cmake.in
|
|
@@ -54,7 +54,10 @@ set (${HDF5_PACKAGE_NAME}_PARALLEL_FILTERED_WRITES "@PARALLEL_FILTERED_WRITES@")
|
|
#-----------------------------------------------------------------------------
|
|
# Dependencies
|
|
#-----------------------------------------------------------------------------
|
|
+include(CMakeFindDependencyMacro)
|
|
+
|
|
if (${HDF5_PACKAGE_NAME}_ENABLE_PARALLEL)
|
|
+ find_dependency(MPI)
|
|
set (${HDF5_PACKAGE_NAME}_MPI_C_INCLUDE_PATH "@MPI_C_INCLUDE_DIRS@")
|
|
set (${HDF5_PACKAGE_NAME}_MPI_C_LIBRARIES "@MPI_C_LIBRARIES@")
|
|
if (${HDF5_PACKAGE_NAME}_BUILD_FORTRAN)
|
|
@@ -110,11 +113,11 @@ set (${HDF5_PACKAGE_NAME}_VERSION_MINOR @HDF5_VERSION_MINOR@)
|
|
# project which has already built hdf5 as a subproject
|
|
#-----------------------------------------------------------------------------
|
|
if (NOT TARGET "@HDF5_PACKAGE@")
|
|
- if (${HDF5_PACKAGE_NAME}_ENABLE_Z_LIB_SUPPORT AND ${HDF5_PACKAGE_NAME}_PACKAGE_EXTLIBS)
|
|
- include (@PACKAGE_SHARE_INSTALL_DIR@/@ZLIB_PACKAGE_NAME@/@ZLIB_PACKAGE_NAME@@HDF_PACKAGE_EXT@-targets.cmake)
|
|
+ if (${HDF5_PACKAGE_NAME}_ENABLE_Z_LIB_SUPPORT)
|
|
+ find_dependency(ZLIB)
|
|
endif ()
|
|
- if (${HDF5_PACKAGE_NAME}_ENABLE_SZIP_SUPPORT AND ${HDF5_PACKAGE_NAME}_PACKAGE_EXTLIBS)
|
|
- include (@PACKAGE_SHARE_INSTALL_DIR@/@SZIP_PACKAGE_NAME@/@SZIP_PACKAGE_NAME@@HDF_PACKAGE_EXT@-targets.cmake)
|
|
+ if (${HDF5_PACKAGE_NAME}_ENABLE_SZIP_SUPPORT)
|
|
+ find_dependency(szip)
|
|
endif ()
|
|
include (@PACKAGE_SHARE_INSTALL_DIR@/@HDF5_PACKAGE@/@HDF5_PACKAGE@@HDF_PACKAGE_EXT@-targets.cmake)
|
|
endif ()
|