diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2020-08-26 13:43:11 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2020-08-26 13:43:11 (GMT) |
| commit | 04971bec7f06893c9971c03eaf7d83bf5726c22c (patch) | |
| tree | 22699d2b142bafa39bd40709cac6140c29d5f9ea | |
| parent | 91c59ffc56f0da30943bf5cac06c9f7a3006496c (diff) | |
| parent | 213d7e62eb4cad1ee768f001813ef07962b835be (diff) | |
| download | hdf5-04971bec7f06893c9971c03eaf7d83bf5726c22c.zip hdf5-04971bec7f06893c9971c03eaf7d83bf5726c22c.tar.gz hdf5-04971bec7f06893c9971c03eaf7d83bf5726c22c.tar.bz2 | |
Merge pull request #2844 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit '213d7e62eb4cad1ee768f001813ef07962b835be':
The version string has a second use for packaging
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tools/test/misc/testfiles/h5mkgrp_version.txt.in | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 595e3c3..029449d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -340,8 +340,10 @@ 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_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@ |