diff options
| author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2022-02-17 16:05:08 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-17 16:05:08 (GMT) |
| commit | 08ec5b45a5c069077087351923afe780488421a3 (patch) | |
| tree | 5511f7619f1a7cb4e5402a3f0736124ab1a66f0c /CMakeInstallation.cmake | |
| parent | bbb0acf353920f8315ad59e80e9e8d0754cca655 (diff) | |
| download | hdf5-08ec5b45a5c069077087351923afe780488421a3.zip hdf5-08ec5b45a5c069077087351923afe780488421a3.tar.gz hdf5-08ec5b45a5c069077087351923afe780488421a3.tar.bz2 | |
Add SZ filter and adjust compression file names to avoid conflicts (#1434)
* Updated plugins project required adjustments
* Updated plugins need to distinguish external libs
* Fix missed rename
* Use same name for windows as linux - avoid name clash
Diffstat (limited to 'CMakeInstallation.cmake')
| -rw-r--r-- | CMakeInstallation.cmake | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/CMakeInstallation.cmake b/CMakeInstallation.cmake index 609cd7e..f5e0897 100644 --- a/CMakeInstallation.cmake +++ b/CMakeInstallation.cmake @@ -442,11 +442,11 @@ The HDF5 data model, file format, API, library, and tools are open and distribut if (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "GIT" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ") if (ZLIB_FOUND AND ZLIB_USE_EXTERNAL) if (WIN32) - set (CPACK_INSTALL_CMAKE_PROJECTS "${CPACK_INSTALL_CMAKE_PROJECTS};${ZLIB_INCLUDE_DIR_GEN};ZLIB;ALL;/") + set (CPACK_INSTALL_CMAKE_PROJECTS "${CPACK_INSTALL_CMAKE_PROJECTS};${ZLIB_INCLUDE_DIR_GEN};HDF5_ZLIB;ALL;/") else () - set (CPACK_INSTALL_CMAKE_PROJECTS "${CPACK_INSTALL_CMAKE_PROJECTS};${ZLIB_INCLUDE_DIR_GEN};ZLIB;libraries;/") - set (CPACK_INSTALL_CMAKE_PROJECTS "${CPACK_INSTALL_CMAKE_PROJECTS};${ZLIB_INCLUDE_DIR_GEN};ZLIB;headers;/") - set (CPACK_INSTALL_CMAKE_PROJECTS "${CPACK_INSTALL_CMAKE_PROJECTS};${ZLIB_INCLUDE_DIR_GEN};ZLIB;configinstall;/") + set (CPACK_INSTALL_CMAKE_PROJECTS "${CPACK_INSTALL_CMAKE_PROJECTS};${ZLIB_INCLUDE_DIR_GEN};HDF5_ZLIB;libraries;/") + set (CPACK_INSTALL_CMAKE_PROJECTS "${CPACK_INSTALL_CMAKE_PROJECTS};${ZLIB_INCLUDE_DIR_GEN};HDF5_ZLIB;headers;/") + set (CPACK_INSTALL_CMAKE_PROJECTS "${CPACK_INSTALL_CMAKE_PROJECTS};${ZLIB_INCLUDE_DIR_GEN};HDF5_ZLIB;configinstall;/") endif () endif () if (SZIP_FOUND AND SZIP_USE_EXTERNAL) |