diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2014-04-22 18:41:11 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2014-04-22 18:41:11 (GMT) |
| commit | 2b11123a200e4595f8bd563476486987c6cc03f4 (patch) | |
| tree | 6402865aff813ca8d338b2260dcb5867c13ae7f5 | |
| parent | a75e8dd654268ba1dd35abf3a78da2f115802029 (diff) | |
| download | hdf5-2b11123a200e4595f8bd563476486987c6cc03f4.zip hdf5-2b11123a200e4595f8bd563476486987c6cc03f4.tar.gz hdf5-2b11123a200e4595f8bd563476486987c6cc03f4.tar.bz2 | |
[svn-r25075] Correct the install folder logic.
Tested: local linux and Mac
| -rw-r--r-- | CMakeInstallation.cmake | 35 | ||||
| -rw-r--r-- | CMakeLists.txt | 16 |
2 files changed, 32 insertions, 19 deletions
diff --git a/CMakeInstallation.cmake b/CMakeInstallation.cmake index 0604802..7d37b40 100644 --- a/CMakeInstallation.cmake +++ b/CMakeInstallation.cmake @@ -112,6 +112,24 @@ install ( ) #----------------------------------------------------------------------------- +# Create pkgconfig files +#----------------------------------------------------------------------------- +foreach (libs ${LINK_LIBS}) + set (LIBS "${LIBS} -l${libs}") +endforeach (libs ${LINK_LIBS}) +foreach (libs ${HDF5_LIBRARIES_TO_EXPORT}) + set (HDF5LIBS "${HDF5LIBS} -l${libs}") +endforeach (libs ${HDF5_LIBRARIES_TO_EXPORT}) +configure_file ( + ${HDF5_RESOURCES_DIR}/libhdf5.pc.in + ${HDF5_BINARY_DIR}/CMakeFiles/libhdf5.pc @ONLY +) +install ( + FILES ${HDF5_BINARY_DIR}/CMakeFiles/libhdf5.pc + DESTINATION ${HDF5_INSTALL_LIB_DIR}/pkgconfig +) + +#----------------------------------------------------------------------------- # Configure the HDF518_Examples.cmake file and the examples #----------------------------------------------------------------------------- option (HDF5_PACK_EXAMPLES "Package the HDF5 Library Examples Compressed File" OFF) @@ -240,6 +258,19 @@ if (NOT HDF5_EXTERNALLY_CONFIGURED) endif (EXISTS "${HDF5_SOURCE_DIR}/release_docs" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/release_docs") endif (NOT HDF5_EXTERNALLY_CONFIGURED) +if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) + if (CMAKE_HOST_UNIX) + set (CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/HDF_Group/${HDF5_PACKAGE_NAME}/${HDF5_PACKAGE_VERSION}" + CACHE PATH "Install path prefix, prepended onto install directories." FORCE) + else (CMAKE_HOST_UNIX) + GetDefaultWindowsPrefixBase(CMAKE_GENERIC_PROGRAM_FILES) + set (CMAKE_INSTALL_PREFIX + "${CMAKE_GENERIC_PROGRAM_FILES}/HDF_Group/${HDF5_PACKAGE_NAME}/${HDF5_PACKAGE_VERSION}" + CACHE PATH "Install path prefix, prepended onto install directories." FORCE) + set (CMAKE_GENERIC_PROGRAM_FILES) + endif (CMAKE_HOST_UNIX) +endif (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) + #----------------------------------------------------------------------------- # Set the cpack variables #----------------------------------------------------------------------------- @@ -292,10 +323,8 @@ if (NOT HDF5_EXTERNALLY_CONFIGURED AND NOT HDF5_NO_PACKAGES) elseif (APPLE) LIST (APPEND CPACK_GENERATOR "DragNDrop") set (CPACK_COMPONENTS_ALL_IN_ONE_PACKAGE ON) - set (CPACK_PACKAGE_DEFAULT_LOCATION "/opt/${CPACK_PACKAGE_NAME}") - set (CPACK_PACKAGING_INSTALL_PREFIX "/") + set (CPACK_PACKAGING_INSTALL_PREFIX "/${CPACK_PACKAGE_INSTALL_DIRECTORY}") set (CPACK_PACKAGE_ICON "${HDF5_RESOURCES_DIR}/hdf.icns") - set (CPACK_SET_DESTDIR TRUE) # Required when packaging, and set CMAKE_INSTALL_PREFIX to "/". if (HDF5_PACK_MACOSX_BUNDLE) LIST (APPEND CPACK_GENERATOR "Bundle") diff --git a/CMakeLists.txt b/CMakeLists.txt index 106c59c..ea6f945 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -213,22 +213,6 @@ set (HDF5_PACKAGE_URL "http://www.hdfgroup.org") set (HDF5_PACKAGE_BUGREPORT "help@hdfgroup.org") #----------------------------------------------------------------------------- -# Set Install folder value -#----------------------------------------------------------------------------- -if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) - if (CMAKE_HOST_UNIX) - set (CMAKE_INSTALL_PREFIX "/HDF_Group/${HDF5_PACKAGE_NAME}/${HDF5_PACKAGE_VERSION}" - CACHE PATH "Install path prefix, prepended onto install directories." FORCE) - else (CMAKE_HOST_UNIX) - GetDefaultWindowsPrefixBase(CMAKE_GENERIC_PROGRAM_FILES) - set (CMAKE_INSTALL_PREFIX - "${CMAKE_GENERIC_PROGRAM_FILES}/HDF_Group/${HDF5_PACKAGE_NAME}/${HDF5_PACKAGE_VERSION}" - CACHE PATH "Install path prefix, prepended onto install directories." FORCE) - set (CMAKE_GENERIC_PROGRAM_FILES) - endif (CMAKE_HOST_UNIX) -endif (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) - -#----------------------------------------------------------------------------- # Include some macros for reusable code #----------------------------------------------------------------------------- include (${HDF5_RESOURCES_DIR}/HDFMacros.cmake) |