diff options
| author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2023-10-30 17:11:07 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-30 17:11:07 (GMT) |
| commit | 44ec53ec485029fc964d67c811c5d3e227f99372 (patch) | |
| tree | 7d74d5678a4c36c384f45825637ed8270906896d /config/cmake/ZLIB | |
| parent | 58ef7dcdc9bfbfc65fe69d782914671f66322d85 (diff) | |
| download | hdf5-44ec53ec485029fc964d67c811c5d3e227f99372.zip hdf5-44ec53ec485029fc964d67c811c5d3e227f99372.tar.gz hdf5-44ec53ec485029fc964d67c811c5d3e227f99372.tar.bz2 | |
Remove CDASH_LOCAL variable reference (#3796)
Diffstat (limited to 'config/cmake/ZLIB')
| -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}") |