From 7c7b4e3deb555c2d2fc3a6a029549a014f29d50e Mon Sep 17 00:00:00 2001 From: Allen Byrne Date: Mon, 20 Sep 2010 16:02:26 -0500 Subject: [svn-r19438] Correct use of lib, include, bin in INSTALL commands to use proper variables. Tested: local linux --- CMakeLists.txt | 6 +++--- c++/src/CMakeLists.txt | 8 ++++---- fortran/src/CMakeLists.txt | 10 +++++----- hl/c++/src/CMakeLists.txt | 8 ++++---- hl/fortran/src/CMakeLists.txt | 19 ++++++++++++++++--- hl/src/CMakeLists.txt | 8 ++++---- hl/tools/CMakeLists.txt | 2 +- tools/h5copy/CMakeLists.txt | 2 +- tools/h5diff/CMakeLists.txt | 2 +- tools/h5dump/CMakeLists.txt | 2 +- tools/h5import/CMakeLists.txt | 2 +- tools/h5jam/CMakeLists.txt | 2 +- tools/h5ls/CMakeLists.txt | 2 +- tools/h5repack/CMakeLists.txt | 2 +- tools/h5stat/CMakeLists.txt | 2 +- tools/lib/CMakeLists.txt | 8 ++++---- tools/misc/CMakeLists.txt | 2 +- 17 files changed, 50 insertions(+), 37 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 47f529f..ce6b757 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -719,7 +719,7 @@ ENDIF (NOT HDF5_EXTERNALLY_CONFIGURED) IF (NOT HDF5_EXTERNALLY_CONFIGURED) INSTALL ( EXPORT ${HDF5_EXPORTED_TARGETS} - DESTINATION lib/cmake/hdf5-${HDF5_PACKAGE_VERSION} + DESTINATION ${HDF5_INSTALL_LIB_DIR}/cmake/hdf5-${HDF5_PACKAGE_VERSION} FILE hdf5-targets.cmake ) ENDIF (NOT HDF5_EXTERNALLY_CONFIGURED) @@ -760,7 +760,7 @@ IF (NOT HDF5_EXTERNALLY_CONFIGURED) ) INSTALL ( FILES ${HDF5_BINARY_DIR}/CMakeFiles/hdf5-config.cmake - DESTINATION lib/cmake/hdf5-${HDF5_PACKAGE_VERSION} + DESTINATION ${HDF5_INSTALL_LIB_DIR}/cmake/hdf5-${HDF5_PACKAGE_VERSION} ) ENDIF (NOT HDF5_EXTERNALLY_CONFIGURED) @@ -774,7 +774,7 @@ IF (NOT HDF5_EXTERNALLY_CONFIGURED) ) INSTALL ( FILES ${HDF5_BINARY_DIR}/CMakeFiles/hdf5-config-version.cmake - DESTINATION lib/cmake/hdf5-${HDF5_PACKAGE_VERSION} + DESTINATION ${HDF5_INSTALL_LIB_DIR}/cmake/hdf5-${HDF5_PACKAGE_VERSION} ) ENDIF (NOT HDF5_EXTERNALLY_CONFIGURED) diff --git a/c++/src/CMakeLists.txt b/c++/src/CMakeLists.txt index 4c6dd5f..ffc2da3 100644 --- a/c++/src/CMakeLists.txt +++ b/c++/src/CMakeLists.txt @@ -93,7 +93,7 @@ INSTALL ( FILES ${CPP_HDRS} DESTINATION - include/cpp + ${HDF5_INSTALL_INCLUDE_DIR}/cpp COMPONENT cppheaders ) @@ -107,9 +107,9 @@ IF (HDF5_EXPORTED_TARGETS) ${HDF5_CPP_LIB_TARGET} EXPORT ${HDF5_EXPORTED_TARGETS} - LIBRARY DESTINATION lib COMPONENT cpplibraries - ARCHIVE DESTINATION lib COMPONENT cpplibraries - RUNTIME DESTINATION bin COMPONENT cpplibraries + LIBRARY DESTINATION ${HDF5_INSTALL_LIB_DIR} COMPONENT cpplibraries + ARCHIVE DESTINATION ${HDF5_INSTALL_LIB_DIR} COMPONENT cpplibraries + RUNTIME DESTINATION ${HDF5_INSTALL_BIN_DIR} COMPONENT cpplibraries ) ENDIF (HDF5_EXPORTED_TARGETS) diff --git a/fortran/src/CMakeLists.txt b/fortran/src/CMakeLists.txt index c2ca1e6..21439f1 100644 --- a/fortran/src/CMakeLists.txt +++ b/fortran/src/CMakeLists.txt @@ -223,7 +223,7 @@ INSTALL ( ${HDF5_F90_BINARY_DIR}/H5f90i_gen.h ${HDF5_F90_BINARY_DIR}/H5fortran_types.f90 DESTINATION - include/fortran + ${HDF5_INSTALL_INCLUDE_DIR}/fortran COMPONENT fortheaders ) @@ -232,7 +232,7 @@ INSTALL ( DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}/\${BUILD_TYPE}/ DESTINATION - include/fortran + ${HDF5_INSTALL_INCLUDE_DIR}/fortran COMPONENT fortheaders ) @@ -247,8 +247,8 @@ IF (HDF5_EXPORTED_TARGETS) ${HDF5_F90_LIB_TARGET} EXPORT ${HDF5_EXPORTED_TARGETS} - LIBRARY DESTINATION lib COMPONENT fortlibraries - ARCHIVE DESTINATION lib COMPONENT fortlibraries - RUNTIME DESTINATION bin COMPONENT fortlibraries + LIBRARY DESTINATION ${HDF5_INSTALL_LIB_DIR} COMPONENT fortlibraries + ARCHIVE DESTINATION ${HDF5_INSTALL_LIB_DIR} COMPONENT fortlibraries + RUNTIME DESTINATION ${HDF5_INSTALL_BIN_DIR} COMPONENT fortlibraries ) ENDIF (HDF5_EXPORTED_TARGETS) diff --git a/hl/c++/src/CMakeLists.txt b/hl/c++/src/CMakeLists.txt index afd4cf4..1e765e9 100644 --- a/hl/c++/src/CMakeLists.txt +++ b/hl/c++/src/CMakeLists.txt @@ -26,7 +26,7 @@ INSTALL ( FILES ${HDF5_HL_CPP_HDRS} DESTINATION - include/hl/cpp + ${HDF5_INSTALL_INCLUDE_DIR}/hl/cpp COMPONENT hlcppheaders ) @@ -40,8 +40,8 @@ IF (HDF5_EXPORTED_TARGETS) ${HDF5_HL_CPP_LIB_TARGET} EXPORT ${HDF5_EXPORTED_TARGETS} - LIBRARY DESTINATION lib COMPONENT hlcpplibraries - ARCHIVE DESTINATION lib COMPONENT hlcpplibraries - RUNTIME DESTINATION bin COMPONENT hlcpplibraries + LIBRARY DESTINATION ${HDF5_INSTALL_LIB_DIR} COMPONENT hlcpplibraries + ARCHIVE DESTINATION ${HDF5_INSTALL_LIB_DIR} COMPONENT hlcpplibraries + RUNTIME DESTINATION ${HDF5_INSTALL_BIN_DIR} COMPONENT hlcpplibraries ) ENDIF (HDF5_EXPORTED_TARGETS) diff --git a/hl/fortran/src/CMakeLists.txt b/hl/fortran/src/CMakeLists.txt index f003c49..67871f4 100644 --- a/hl/fortran/src/CMakeLists.txt +++ b/hl/fortran/src/CMakeLists.txt @@ -82,6 +82,19 @@ H5_SET_LIB_OPTIONS (${HDF5_HL_F90_LIB_TARGET} ${HDF5_HL_F90_LIB_NAME} ${LIB_TYPE ADD_DEPENDENCIES (${HDF5_HL_F90_LIB_TARGET} ${HDF5_HL_F90_C_LIB_TARGET}) #----------------------------------------------------------------------------- +# Add file(s) to CMake Install +#----------------------------------------------------------------------------- + +INSTALL ( + DIRECTORY + ${CMAKE_Fortran_MODULE_DIRECTORY}/\${BUILD_TYPE}/ + DESTINATION + ${HDF5_INSTALL_INCLUDE_DIR}/fortran + COMPONENT + fortheaders +) + +#----------------------------------------------------------------------------- # Add Target(s) to CMake Install for import into other projects #----------------------------------------------------------------------------- IF (HDF5_EXPORTED_TARGETS) @@ -91,8 +104,8 @@ IF (HDF5_EXPORTED_TARGETS) ${HDF5_HL_F90_LIB_TARGET} EXPORT ${HDF5_EXPORTED_TARGETS} - LIBRARY DESTINATION lib COMPONENT hlfortlibraries - ARCHIVE DESTINATION lib COMPONENT hlfortlibraries - RUNTIME DESTINATION bin COMPONENT hlfortlibraries + LIBRARY DESTINATION ${HDF5_INSTALL_LIB_DIR} COMPONENT hlfortlibraries + ARCHIVE DESTINATION ${HDF5_INSTALL_LIB_DIR} COMPONENT hlfortlibraries + RUNTIME DESTINATION ${HDF5_INSTALL_BIN_DIR} COMPONENT hlfortlibraries ) ENDIF (HDF5_EXPORTED_TARGETS) diff --git a/hl/src/CMakeLists.txt b/hl/src/CMakeLists.txt index e34936d..11f6273 100644 --- a/hl/src/CMakeLists.txt +++ b/hl/src/CMakeLists.txt @@ -46,7 +46,7 @@ INSTALL ( FILES ${HL_HEADERS} DESTINATION - include + ${HDF5_INSTALL_INCLUDE_DIR} COMPONENT hlheaders ) @@ -60,8 +60,8 @@ IF (HDF5_EXPORTED_TARGETS) ${HDF5_HL_LIB_TARGET} EXPORT ${HDF5_EXPORTED_TARGETS} - LIBRARY DESTINATION lib COMPONENT hllibraries - ARCHIVE DESTINATION lib COMPONENT hllibraries - RUNTIME DESTINATION bin COMPONENT hllibraries + LIBRARY DESTINATION ${HDF5_INSTALL_LIB_DIR} COMPONENT hllibraries + ARCHIVE DESTINATION ${HDF5_INSTALL_LIB_DIR} COMPONENT hllibraries + RUNTIME DESTINATION ${HDF5_INSTALL_BIN_DIR} COMPONENT hllibraries ) ENDIF (HDF5_EXPORTED_TARGETS) diff --git a/hl/tools/CMakeLists.txt b/hl/tools/CMakeLists.txt index 388b1da..8ed3fab 100644 --- a/hl/tools/CMakeLists.txt +++ b/hl/tools/CMakeLists.txt @@ -54,7 +54,7 @@ INSTALL ( gif2h5 hdf2gif RUNTIME DESTINATION - bin/tools + ${HDF5_INSTALL_BIN_DIR}/tools COMPONENT hltoolsapplications ) diff --git a/tools/h5copy/CMakeLists.txt b/tools/h5copy/CMakeLists.txt index 271c28f..4ef368e 100644 --- a/tools/h5copy/CMakeLists.txt +++ b/tools/h5copy/CMakeLists.txt @@ -251,7 +251,7 @@ INSTALL ( TARGETS h5copy RUNTIME DESTINATION - bin/tools + ${HDF5_INSTALL_BIN_DIR}/tools COMPONENT toolsapplications ) diff --git a/tools/h5diff/CMakeLists.txt b/tools/h5diff/CMakeLists.txt index 18c8ca0..1a6d3df 100644 --- a/tools/h5diff/CMakeLists.txt +++ b/tools/h5diff/CMakeLists.txt @@ -795,7 +795,7 @@ INSTALL ( TARGETS h5diff RUNTIME DESTINATION - bin/tools + ${HDF5_INSTALL_BIN_DIR}/tools COMPONENT toolsapplications ) diff --git a/tools/h5dump/CMakeLists.txt b/tools/h5dump/CMakeLists.txt index 305b2c5..334e79c 100644 --- a/tools/h5dump/CMakeLists.txt +++ b/tools/h5dump/CMakeLists.txt @@ -974,7 +974,7 @@ INSTALL ( TARGETS h5dump RUNTIME DESTINATION - bin/tools + ${HDF5_INSTALL_BIN_DIR}/tools COMPONENT toolsapplications ) diff --git a/tools/h5import/CMakeLists.txt b/tools/h5import/CMakeLists.txt index 7d937bd..00f6f1f 100644 --- a/tools/h5import/CMakeLists.txt +++ b/tools/h5import/CMakeLists.txt @@ -60,7 +60,7 @@ INSTALL ( TARGETS h5import RUNTIME DESTINATION - bin/tools + ${HDF5_INSTALL_BIN_DIR}/tools COMPONENT toolsapplications ) diff --git a/tools/h5jam/CMakeLists.txt b/tools/h5jam/CMakeLists.txt index 94f2e4b..69b3e75 100644 --- a/tools/h5jam/CMakeLists.txt +++ b/tools/h5jam/CMakeLists.txt @@ -83,7 +83,7 @@ INSTALL ( TARGETS h5jam h5unjam RUNTIME DESTINATION - bin/tools + ${HDF5_INSTALL_BIN_DIR}/tools COMPONENT toolsapplications ) diff --git a/tools/h5ls/CMakeLists.txt b/tools/h5ls/CMakeLists.txt index ddb0bfe..f6c1b4ce 100644 --- a/tools/h5ls/CMakeLists.txt +++ b/tools/h5ls/CMakeLists.txt @@ -270,7 +270,7 @@ INSTALL ( TARGETS h5ls RUNTIME DESTINATION - bin/tools + ${HDF5_INSTALL_BIN_DIR}/tools COMPONENT toolsapplications ) diff --git a/tools/h5repack/CMakeLists.txt b/tools/h5repack/CMakeLists.txt index 0a58b8a..a0b0245 100644 --- a/tools/h5repack/CMakeLists.txt +++ b/tools/h5repack/CMakeLists.txt @@ -665,7 +665,7 @@ INSTALL ( TARGETS h5repack RUNTIME DESTINATION - bin/tools + ${HDF5_INSTALL_BIN_DIR}/tools COMPONENT toolsapplications ) diff --git a/tools/h5stat/CMakeLists.txt b/tools/h5stat/CMakeLists.txt index 1640479..69793ae 100644 --- a/tools/h5stat/CMakeLists.txt +++ b/tools/h5stat/CMakeLists.txt @@ -145,7 +145,7 @@ INSTALL ( TARGETS h5stat RUNTIME DESTINATION - bin/tools + ${HDF5_INSTALL_BIN_DIR}/tools COMPONENT toolsapplications ) diff --git a/tools/lib/CMakeLists.txt b/tools/lib/CMakeLists.txt index 05fd607..879e30e 100644 --- a/tools/lib/CMakeLists.txt +++ b/tools/lib/CMakeLists.txt @@ -55,7 +55,7 @@ INSTALL ( FILES ${H5_TOOLS_LIB_HDRS} DESTINATION - include/tools + ${HDF5_INSTALL_INCLUDE_DIR}/tools COMPONENT toolsheaders ) @@ -84,8 +84,8 @@ IF (HDF5_EXPORTED_TARGETS) ${HDF5_TOOLS_LIB_TARGET} EXPORT ${HDF5_EXPORTED_TARGETS} - LIBRARY DESTINATION lib/tools COMPONENT toolslibraries - ARCHIVE DESTINATION lib/tools COMPONENT toolslibraries - RUNTIME DESTINATION bin/tools COMPONENT toolslibraries + 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 ) ENDIF (HDF5_EXPORTED_TARGETS) diff --git a/tools/misc/CMakeLists.txt b/tools/misc/CMakeLists.txt index 1726ae1..7509365 100644 --- a/tools/misc/CMakeLists.txt +++ b/tools/misc/CMakeLists.txt @@ -130,7 +130,7 @@ INSTALL ( TARGETS h5debug h5repart RUNTIME DESTINATION - bin/tools + ${HDF5_INSTALL_BIN_DIR}/tools COMPONENT toolsapplications ) -- cgit v0.12