diff options
| author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2023-11-02 12:54:32 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-02 12:54:32 (GMT) |
| commit | 528a8e7f46a2adc9b70e47eb7166c385d36220e8 (patch) | |
| tree | 936f32012b2ad61286e1de743bb2abd41873ae63 /config/cmake/ZLIB/CMakeLists.txt | |
| parent | 90893d28c2f2a795facba1e20eb99addae007f2d (diff) | |
| download | hdf5-528a8e7f46a2adc9b70e47eb7166c385d36220e8.zip hdf5-528a8e7f46a2adc9b70e47eb7166c385d36220e8.tar.gz hdf5-528a8e7f46a2adc9b70e47eb7166c385d36220e8.tar.bz2 | |
Sync CMake changes from develop (#3811)
Guard test dirs with HDF5_EXTERNALLY_CONFIGURED
Add toolchain support to examples testing
Diffstat (limited to 'config/cmake/ZLIB/CMakeLists.txt')
| -rw-r--r-- | config/cmake/ZLIB/CMakeLists.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/config/cmake/ZLIB/CMakeLists.txt b/config/cmake/ZLIB/CMakeLists.txt index 12411ac..5c06a54 100644 --- a/config/cmake/ZLIB/CMakeLists.txt +++ b/config/cmake/ZLIB/CMakeLists.txt @@ -428,10 +428,10 @@ configure_file (${ZLIB_SOURCE_DIR}/README ${ZLIB_BINARY_DIR}/ZLIB_README @ONLY) if (NOT ZLIB_EXTERNALLY_CONFIGURED) set (CPACK_PACKAGE_VENDOR "HDF_Group") set (CPACK_PACKAGE_NAME "${ZLIB_PACKAGE_NAME}") - if (CDASH_LOCAL) - set (CPACK_PACKAGE_VERSION "${ZLIB_PACKAGE_VERSION}") - else () + if (NOT WIN32 OR ZLIB_VERS_SUBRELEASE MATCHES "^[0-9]+$") set (CPACK_PACKAGE_VERSION "${ZLIB_PACKAGE_VERSION_STRING}") + else () + set (CPACK_PACKAGE_VERSION "${ZLIB_PACKAGE_VERSION}") endif () set (CPACK_PACKAGE_VERSION_MAJOR "${ZLIB_PACKAGE_VERSION_MAJOR}") set (CPACK_PACKAGE_VERSION_MINOR "${ZLIB_PACKAGE_VERSION_MINOR}") |