diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2020-08-26 14:03:55 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2020-08-26 14:04:20 (GMT) |
| commit | 574cb4e9425ba1ce8bf0a777caa6cf4e9d57ca4e (patch) | |
| tree | a07d6b56f31ed68ab91e17888015537e47030390 | |
| parent | 27ed99e9f38aeb77d1496a81e2c9f22760579af1 (diff) | |
| download | hdf5-574cb4e9425ba1ce8bf0a777caa6cf4e9d57ca4e.zip hdf5-574cb4e9425ba1ce8bf0a777caa6cf4e9d57ca4e.tar.gz hdf5-574cb4e9425ba1ce8bf0a777caa6cf4e9d57ca4e.tar.bz2 | |
The version string has a second use for packaging
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | tools/test/misc/testfiles/h5mkgrp_version.txt.in | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 934aeeb..ac35e9e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -339,9 +339,11 @@ set (HDF5_PACKAGE_VERSION "${H5_VERS_MAJOR}.${H5_VERS_MINOR}.${H5_VERS_RELEASE}" set (HDF5_PACKAGE_VERSION_MAJOR "${H5_VERS_MAJOR}.${H5_VERS_MINOR}") set (HDF5_PACKAGE_VERSION_MINOR "${H5_VERS_RELEASE}") if (H5_VERS_SUBRELEASE) - set (HDF5_PACKAGE_VERSION_STRING "${HDF5_PACKAGE_VERSION}-${H5_VERS_SUBRELEASE}") + set (HDF5_PACKAGE_VERSION_STRING "${HDF5_PACKAGE_VERSION}.${H5_VERS_SUBRELEASE}") + set (HDF5_RELEASE_VERSION_STRING "${HDF5_PACKAGE_VERSION}-${H5_VERS_SUBRELEASE}") else () set (HDF5_PACKAGE_VERSION_STRING "${HDF5_PACKAGE_VERSION}") + set (HDF5_RELEASE_VERSION_STRING "${HDF5_PACKAGE_VERSION}") endif () set (HDF5_LIB_PACKAGE_SOVERSION "${H5_LIB_SOVERS_MAJOR}.${H5_LIB_SOVERS_RELEASE}.${H5_LIB_SOVERS_MINOR}") set (HDF5_LIB_PACKAGE_SOVERSION_MAJOR "${H5_LIB_SOVERS_MAJOR}") diff --git a/tools/test/misc/testfiles/h5mkgrp_version.txt.in b/tools/test/misc/testfiles/h5mkgrp_version.txt.in index 75c13a5..37dbabd 100644 --- a/tools/test/misc/testfiles/h5mkgrp_version.txt.in +++ b/tools/test/misc/testfiles/h5mkgrp_version.txt.in @@ -1 +1 @@ -h5mkgrp: Version @HDF5_PACKAGE_VERSION_STRING@ +h5mkgrp: Version @HDF5_RELEASE_VERSION_STRING@ |