diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2011-08-01 19:36:58 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2011-08-01 19:36:58 (GMT) |
| commit | 7d47d81df0989c3e54e652124bb89776ce3926e2 (patch) | |
| tree | 413db386dcec48668d7ed0a1188f9c772c07b43d /tools/lib/CMakeLists.txt | |
| parent | c71bc6f2bc6c879dfa59bb8c2c94c255893dd042 (diff) | |
| download | hdf5-7d47d81df0989c3e54e652124bb89776ce3926e2.zip hdf5-7d47d81df0989c3e54e652124bb89776ce3926e2.tar.gz hdf5-7d47d81df0989c3e54e652124bb89776ce3926e2.tar.bz2 | |
[svn-r21165] Remove subfolder in library install
Tested: local linux
Diffstat (limited to 'tools/lib/CMakeLists.txt')
| -rw-r--r-- | tools/lib/CMakeLists.txt | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tools/lib/CMakeLists.txt b/tools/lib/CMakeLists.txt index c3662f6..1e8afa1 100644 --- a/tools/lib/CMakeLists.txt +++ b/tools/lib/CMakeLists.txt @@ -38,7 +38,7 @@ H5_SET_LIB_OPTIONS ( ${HDF5_TOOLS_LIB_TARGET} ${HDF5_TOOLS_LIB_NAME} ${LIB_TYPE} HDF5_TOOLS_LIB_NAME_RELEASE - HDF5_TOOLS_LIB_NAME_DEBUG + HDF5_TOOLS_LIB_NAME_DEBUG ) ############################################################################## @@ -54,7 +54,7 @@ INSTALL ( FILES ${H5_TOOLS_LIB_HDRS} DESTINATION - ${HDF5_INSTALL_INCLUDE_DIR}/tools + ${HDF5_INSTALL_INCLUDE_DIR} COMPONENT toolsheaders ) @@ -68,7 +68,7 @@ IF (APPLE) IF (HDF5_BUILD_WITH_INSTALL_NAME) SET_TARGET_PROPERTIES(${HDF5_TOOLS_LIB_TARGET} PROPERTIES LINK_FLAGS "-current_version ${HDF5_PACKAGE_VERSION} -compatibility_version ${HDF5_PACKAGE_VERSION}" - INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib/tools" + INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib" BUILD_WITH_INSTALL_RPATH ${HDF5_BUILD_WITH_INSTALL_NAME} ) ENDIF (HDF5_BUILD_WITH_INSTALL_NAME) @@ -83,8 +83,8 @@ IF (HDF5_EXPORTED_TARGETS) ${HDF5_TOOLS_LIB_TARGET} EXPORT ${HDF5_EXPORTED_TARGETS} - LIBRARY DESTINATION ${HDF5_INSTALL_LIB_DIR}/tools COMPONENT toolslibraries - ARCHIVE DESTINATION ${HDF5_INSTALL_LIB_DIR}/tools COMPONENT toolslibraries - RUNTIME DESTINATION ${HDF5_INSTALL_BIN_DIR}/tools COMPONENT toolslibraries + LIBRARY DESTINATION ${HDF5_INSTALL_LIB_DIR} COMPONENT toolslibraries + ARCHIVE DESTINATION ${HDF5_INSTALL_LIB_DIR} COMPONENT toolslibraries + RUNTIME DESTINATION ${HDF5_INSTALL_BIN_DIR} COMPONENT toolslibraries ) ENDIF (HDF5_EXPORTED_TARGETS) |