diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2013-11-15 18:10:26 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2013-11-15 18:10:26 (GMT) |
| commit | d1009fa230c69f6f4446e1fdfae2582e34f04a8e (patch) | |
| tree | 2babb16dca47f2225c09b00e87b3a2511050605f /CMakeInstallation.cmake | |
| parent | ac88574936c252f9eff7a13cbf6225dc5200c782 (diff) | |
| download | hdf5-d1009fa230c69f6f4446e1fdfae2582e34f04a8e.zip hdf5-d1009fa230c69f6f4446e1fdfae2582e34f04a8e.tar.gz hdf5-d1009fa230c69f6f4446e1fdfae2582e34f04a8e.tar.bz2 | |
[svn-r24455] Add IF block to not override user set path
Diffstat (limited to 'CMakeInstallation.cmake')
| -rw-r--r-- | CMakeInstallation.cmake | 4 |
1 files changed, 3 insertions, 1 deletions
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") |