summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2014-01-16 19:12:02 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2014-01-16 19:12:02 (GMT)
commit0ff7eb5cdab532aa20f4551db1ed0bfab7e85289 (patch)
tree1bb92718c534e55a2ae1d5db74fa9087d745ab46
parent1596d156236ecf4adda6b6294eddce277af4b970 (diff)
downloadhdf5-0ff7eb5cdab532aa20f4551db1ed0bfab7e85289.zip
hdf5-0ff7eb5cdab532aa20f4551db1ed0bfab7e85289.tar.gz
hdf5-0ff7eb5cdab532aa20f4551db1ed0bfab7e85289.tar.bz2
[svn-r24632] Correct name of package location variable
-rw-r--r--CMakeInstallation.cmake4
1 files changed, 2 insertions, 2 deletions
diff --git a/CMakeInstallation.cmake b/CMakeInstallation.cmake
index cea7338..a0a6f3d 100644
--- a/CMakeInstallation.cmake
+++ b/CMakeInstallation.cmake
@@ -204,7 +204,7 @@ IF (NOT HDF5_EXTERNALLY_CONFIGURED AND NOT HDF5_NO_PACKAGES)
SET (CPACK_PACKAGE_VERSION_MAJOR "${HDF5_PACKAGE_VERSION_MAJOR}")
SET (CPACK_PACKAGE_VERSION_MINOR "${HDF5_PACKAGE_VERSION_MINOR}")
SET (CPACK_PACKAGE_VERSION_PATCH "")
- SET (CPACK_PACKAGE_INSTALL_DIRECTORY "${CPACK_PACKAGE_VENDOR}/${HDF5_PACKAGE_NAME}/${CPACK_PACKAGE_VERSION}")
+ SET (CPACK_PACKAGE_INSTALL_DIRECTORY "${CPACK_PACKAGE_VENDOR}/${CPACK_PACKAGE_NAME}/${CPACK_PACKAGE_VERSION}")
IF (EXISTS "${HDF5_SOURCE_DIR}/release_docs")
SET (CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/release_docs/RELEASE.txt")
SET (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/release_docs/COPYING")
@@ -250,7 +250,7 @@ IF (NOT HDF5_EXTERNALLY_CONFIGURED AND NOT HDF5_NO_PACKAGES)
ENDIF(HDF5_PACK_MACOSX_BUNDLE)
ELSE (WIN32)
LIST (APPEND CPACK_GENERATOR "STGZ")
- SET (CPACK_PACKAGING_INSTALL_PREFIX "/${CPACK_PACKAGE_VENDOR}/${CPACK_PACKAGE_NAME}/${CPACK_PACKAGE_VERSION}")
+ SET (CPACK_PACKAGING_INSTALL_PREFIX "/${CPACK_PACKAGE_INSTALL_DIRECTORY}")
SET (CPACK_COMPONENTS_ALL_IN_ONE_PACKAGE ON)
SET (CPACK_DEBIAN_PACKAGE_SECTION "Libraries")