summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2020-08-26 11:54:39 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2020-08-26 11:54:39 (GMT)
commit213d7e62eb4cad1ee768f001813ef07962b835be (patch)
tree22699d2b142bafa39bd40709cac6140c29d5f9ea
parent91c59ffc56f0da30943bf5cac06c9f7a3006496c (diff)
downloadhdf5-213d7e62eb4cad1ee768f001813ef07962b835be.zip
hdf5-213d7e62eb4cad1ee768f001813ef07962b835be.tar.gz
hdf5-213d7e62eb4cad1ee768f001813ef07962b835be.tar.bz2
The version string has a second use for packaging
-rw-r--r--CMakeLists.txt2
-rw-r--r--tools/test/misc/testfiles/h5mkgrp_version.txt.in2
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@