diff options
| author | Albert Cheng <acheng@hdfgroup.org> | 2014-02-26 21:29:55 (GMT) |
|---|---|---|
| committer | Albert Cheng <acheng@hdfgroup.org> | 2014-02-26 21:29:55 (GMT) |
| commit | c2bf6ea162a0481742d1fb742e3c6e094812dfa8 (patch) | |
| tree | ba7fd0bccd8384f3095ccbb565307468744dd214 | |
| parent | 1162465570895657929286c8f5b3958db827833f (diff) | |
| download | hdf5-c2bf6ea162a0481742d1fb742e3c6e094812dfa8.zip hdf5-c2bf6ea162a0481742d1fb742e3c6e094812dfa8.tar.gz hdf5-c2bf6ea162a0481742d1fb742e3c6e094812dfa8.tar.bz2 | |
[svn-r24739] Bug fix: HDFFV-8684
h5committest failed in platypus because cmakehdf5 failed in installation because cmake generates
a install-tarball based on incomplete version number (subrelease string is missing).
Solution:
Fixed $HDF5_PACKAGE_VERSION to contain the subrelease string.
Fixed $HDF5_PACKAGE_VERSION_STRING to be the same as $HDF5_PACKAGE_VERSION.
Tested: jam and platypus in both trunk and v18 branches because the current
version number is trunk has a null sub-release and v18 has a non-null sub-release.
That covers both grounds.
| -rw-r--r-- | CMakeLists.txt | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 4664942..6789d6b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -198,14 +198,15 @@ MESSAGE (STATUS "SOVERSION: ${H5_SOVERS_MAJOR}.${H5_SOVERS_RELEASE}.${H5_SOVERS_ #----------------------------------------------------------------------------- SET (HDF5_PACKAGE "hdf5") SET (HDF5_PACKAGE_NAME "HDF5") -SET (HDF5_PACKAGE_VERSION "${H5_VERS_MAJOR}.${H5_VERS_MINOR}.${H5_VERS_RELEASE}") +#SET (HDF5_PACKAGE_VERSION "${H5_VERS_MAJOR}.${H5_VERS_MINOR}.${H5_VERS_RELEASE}") +IF ("${H5_VERS_SUBRELEASE}" STREQUAL "") + SET (HDF5_PACKAGE_VERSION "${H5_VERS_MAJOR}.${H5_VERS_MINOR}.${H5_VERS_RELEASE}") +ELSE ("${H5_VERS_SUBRELEASE}" STREQUAL "") + SET (HDF5_PACKAGE_VERSION "${H5_VERS_MAJOR}.${H5_VERS_MINOR}.${H5_VERS_RELEASE}-${H5_VERS_SUBRELEASE}") +ENDIF ("${H5_VERS_SUBRELEASE}" STREQUAL "") SET (HDF5_PACKAGE_VERSION_MAJOR "${H5_VERS_MAJOR}.${H5_VERS_MINOR}") SET (HDF5_PACKAGE_VERSION_MINOR "${H5_VERS_RELEASE}") -IF (NOT "${H5_VERS_SUBRELEASE}" STREQUAL "") - SET (HDF5_PACKAGE_VERSION_STRING "${HDF5_PACKAGE_VERSION}-${H5_VERS_SUBRELEASE}") -ELSE (NOT "${H5_VERS_SUBRELEASE}" STREQUAL "") - SET (HDF5_PACKAGE_VERSION_STRING "${HDF5_PACKAGE_VERSION}") -ENDIF (NOT "${H5_VERS_SUBRELEASE}" STREQUAL "") +SET (HDF5_PACKAGE_VERSION_STRING "${HDF5_PACKAGE_VERSION}") SET (HDF5_PACKAGE_SOVERSION "${H5_SOVERS_MAJOR}.${H5_SOVERS_RELEASE}.${H5_SOVERS_MINOR}") SET (HDF5_PACKAGE_STRING "${HDF5_PACKAGE_NAME} ${HDF5_PACKAGE_VERSION_STRING}") SET (HDF5_PACKAGE_TARNAME "${HDF5_PACKAGE}${HDF_PACKAGE_EXT}") |