summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2014-02-27 15:43:08 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2014-02-27 15:43:08 (GMT)
commitdb1b11b69bd5c7da66a82304dd23daf99afdc9d7 (patch)
tree4a0907c0c5e3c7bc14d80f430ee3579d6e80c9c6
parentc2bf6ea162a0481742d1fb742e3c6e094812dfa8 (diff)
downloadhdf5-db1b11b69bd5c7da66a82304dd23daf99afdc9d7.zip
hdf5-db1b11b69bd5c7da66a82304dd23daf99afdc9d7.tar.gz
hdf5-db1b11b69bd5c7da66a82304dd23daf99afdc9d7.tar.bz2
[svn-r24741] HDFFV-8684: Change Package name depending on CDASH_LOCAL configuration variable.
Tested: local linux
-rw-r--r--CMakeInstallation.cmake6
-rw-r--r--CMakeLists.txt13
2 files changed, 11 insertions, 8 deletions
diff --git a/CMakeInstallation.cmake b/CMakeInstallation.cmake
index 5da5007..57376c5 100644
--- a/CMakeInstallation.cmake
+++ b/CMakeInstallation.cmake
@@ -247,7 +247,11 @@ ENDIF (NOT HDF5_EXTERNALLY_CONFIGURED)
IF (NOT HDF5_EXTERNALLY_CONFIGURED AND NOT HDF5_NO_PACKAGES)
SET (CPACK_PACKAGE_VENDOR "HDF_Group")
SET (CPACK_PACKAGE_NAME "${HDF5_PACKAGE_NAME}")
- SET (CPACK_PACKAGE_VERSION "${HDF5_PACKAGE_VERSION}")
+ IF (CDASH_LOCAL)
+ SET (CPACK_PACKAGE_VERSION "${HDF5_PACKAGE_VERSION}")
+ ELSE (CDASH_LOCAL)
+ SET (CPACK_PACKAGE_VERSION "${HDF5_PACKAGE_VERSION_STRING}")
+ ENDIF (CDASH_LOCAL)
SET (CPACK_PACKAGE_VERSION_MAJOR "${HDF5_PACKAGE_VERSION_MAJOR}")
SET (CPACK_PACKAGE_VERSION_MINOR "${HDF5_PACKAGE_VERSION_MINOR}")
SET (CPACK_PACKAGE_VERSION_PATCH "")
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6789d6b..4664942 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -198,15 +198,14 @@ 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}")
-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 "${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}")
-SET (HDF5_PACKAGE_VERSION_STRING "${HDF5_PACKAGE_VERSION}")
+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_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}")