diff options
Diffstat (limited to 'hl')
| -rw-r--r-- | hl/c++/src/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | hl/fortran/src/CMakeLists.txt | 19 | ||||
| -rw-r--r-- | hl/src/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | hl/tools/CMakeLists.txt | 2 |
4 files changed, 25 insertions, 12 deletions
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 ) |