diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2014-10-03 16:13:55 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2014-10-03 16:13:55 (GMT) |
| commit | 6cc1d95b5f1eabc70deb02eb3a73785919ff9d0f (patch) | |
| tree | e947253d808a96320f2db7e81a009c6aeec4f841 | |
| parent | ca6ffd477d11268cb4d37174417befe6506ae47b (diff) | |
| download | hdf5-6cc1d95b5f1eabc70deb02eb3a73785919ff9d0f.zip hdf5-6cc1d95b5f1eabc70deb02eb3a73785919ff9d0f.tar.gz hdf5-6cc1d95b5f1eabc70deb02eb3a73785919ff9d0f.tar.bz2 | |
[svn-r25662] Correct packaging paths
| -rw-r--r-- | CMakeInstallation.cmake | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/CMakeInstallation.cmake b/CMakeInstallation.cmake index a04b06a..beeea60 100644 --- a/CMakeInstallation.cmake +++ b/CMakeInstallation.cmake @@ -34,7 +34,7 @@ if (NOT HDF5_EXTERNALLY_CONFIGURED) endif (NOT HDF5_EXTERNALLY_CONFIGURED) #----------------------------------------------------------------------------- -# Set includess needed for build +# Set includes needed for build #----------------------------------------------------------------------------- set (HDF5_INCLUDES_BUILD_TIME ${HDF5_SRC_DIR} ${HDF5_CPP_SRC_DIR} ${HDF5_HL_SRC_DIR} @@ -52,12 +52,12 @@ set (HDF5_VERSION_MINOR ${HDF5_PACKAGE_VERSION_MINOR}) # Configure the hdf5-config.cmake file for the build directory #----------------------------------------------------------------------------- set(INCLUDE_INSTALL_DIR HDF5_INSTALL_INCLUDE_DIR ) -set(SHARE_INSTALL_DIR "${CMAKE_CURRENT_BINARY_DIR}/share" ) +set(SHARE_INSTALL_DIR "${CMAKE_CURRENT_BINARY_DIR}/${HDF5_INSTALL_CMAKE_DIR}" ) set(CURRENT_BUILD_DIR "${CMAKE_CURRENT_BINARY_DIR}" ) configure_package_config_file ( ${HDF_RESOURCES_DIR}/hdf5-config.cmake.in "${HDF5_BINARY_DIR}/${HDF5_PACKAGE}${HDF_PACKAGE_EXT}-config.cmake" - INSTALL_DESTINATION "${CMAKE_CURRENT_BINARY_DIR}" + INSTALL_DESTINATION "${HDF5_INSTALL_CMAKE_DIR}" PATH_VARS INCLUDE_INSTALL_DIR SHARE_INSTALL_DIR CURRENT_BUILD_DIR INSTALL_PREFIX "${CMAKE_CURRENT_BINARY_DIR}" ) @@ -81,12 +81,12 @@ endif (NOT HDF5_EXTERNALLY_CONFIGURED) # Configure the hdf5-config.cmake file for the install directory #----------------------------------------------------------------------------- set(INCLUDE_INSTALL_DIR HDF5_INSTALL_INCLUDE_DIR ) -set(SHARE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/share/" ) +set(SHARE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${HDF5_INSTALL_CMAKE_DIR}" ) set(CURRENT_BUILD_DIR "${CMAKE_INSTALL_PREFIX}" ) configure_package_config_file ( ${HDF_RESOURCES_DIR}/hdf5-config.cmake.in "${HDF5_BINARY_DIR}/CMakeFiles/${HDF5_PACKAGE}${HDF_PACKAGE_EXT}-config.cmake" - INSTALL_DESTINATION "${CMAKE_INSTALL_PREFIX}" + INSTALL_DESTINATION "${HDF5_INSTALL_CMAKE_DIR}" PATH_VARS HDF5_INSTALL_INCLUDE_DIR SHARE_INSTALL_DIR CURRENT_BUILD_DIR ) |