From d1009fa230c69f6f4446e1fdfae2582e34f04a8e Mon Sep 17 00:00:00 2001 From: Allen Byrne Date: Fri, 15 Nov 2013 13:10:26 -0500 Subject: [svn-r24455] Add IF block to not override user set path --- CMakeInstallation.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CMakeInstallation.cmake b/CMakeInstallation.cmake index e0461e1..cc2cf84 100644 --- a/CMakeInstallation.cmake +++ b/CMakeInstallation.cmake @@ -234,7 +234,9 @@ IF (NOT HDF5_EXTERNALLY_CONFIGURED AND NOT HDF5_NO_PACKAGES) LIST (APPEND CPACK_GENERATOR "Bundle") SET (CPACK_BUNDLE_NAME "${HDF5_PACKAGE_STRING}") SET (CPACK_BUNDLE_LOCATION "/") # make sure CMAKE_INSTALL_PREFIX ends in / - SET (CMAKE_INSTALL_PREFIX "/${CPACK_BUNDLE_NAME}.framework/Versions/${CPACK_PACKAGE_VERSION}/${CPACK_PACKAGE_NAME}/") + IF(NOT DEFINED CMAKE_INSTALL_PREFIX) + SET (CMAKE_INSTALL_PREFIX "/${CPACK_BUNDLE_NAME}.framework/Versions/${CPACK_PACKAGE_VERSION}/${CPACK_PACKAGE_NAME}/") + ENDIF(NOT DEFINED CMAKE_INSTALL_PREFIX) SET (CPACK_BUNDLE_ICON "${HDF5_RESOURCES_DIR}/hdf.gif") SET (CPACK_BUNDLE_PLIST "${HDF5_BINARY_DIR}/CMakeFiles/Info.plist") # SET (CPACK_BUNDLE_STARTUP_COMMAND "${HDF5_BINARY_DIR}/CMakeFiles/${HDF5_PACKAGE}${HDF_PACKAGE_EXT}-startup.sh") -- cgit v0.12