mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-01-18 15:15:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r19434] Correct use of lib, include, bin in INSTALL commands to use proper variables.

Browse Source 
Tested: local linux
This commit is contained in:
Allen Byrne 2010-09-20 15:38:35 -05:00
parent 441f2ed99f
commit b4be8ae3d5
17 changed files with 50 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -717,7 +717,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)
@ -758,7 +758,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)
@ -772,7 +772,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)

8
c++/src/CMakeLists.txt
View File

@ -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)

10
fortran/src/CMakeLists.txt
View File

@ -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)

8
hl/c++/src/CMakeLists.txt
View File

@ -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)

19
hl/fortran/src/CMakeLists.txt
View File

@ -81,6 +81,19 @@ SET_GLOBAL_VARIABLE (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF
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
#-----------------------------------------------------------------------------
@ -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)

8
hl/src/CMakeLists.txt
View File

@ -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)

2
hl/tools/CMakeLists.txt
View File

@ -54,7 +54,7 @@ INSTALL (
gif2h5
hdf2gif
RUNTIME DESTINATION
bin/tools
${HDF5_INSTALL_BIN_DIR}/tools
COMPONENT
hltoolsapplications
)

2
tools/h5copy/CMakeLists.txt
View File

@ -251,7 +251,7 @@ INSTALL (
TARGETS
h5copy
RUNTIME DESTINATION
bin/tools
${HDF5_INSTALL_BIN_DIR}/tools
COMPONENT
toolsapplications
)

2
tools/h5diff/CMakeLists.txt
View File

@ -795,7 +795,7 @@ INSTALL (
TARGETS
h5diff
RUNTIME DESTINATION
bin/tools
${HDF5_INSTALL_BIN_DIR}/tools
COMPONENT
toolsapplications
)

2
tools/h5dump/CMakeLists.txt
View File

@ -885,7 +885,7 @@ INSTALL (
TARGETS
h5dump
RUNTIME DESTINATION
bin/tools
${HDF5_INSTALL_BIN_DIR}/tools
COMPONENT
toolsapplications
)

2
tools/h5import/CMakeLists.txt
View File

@ -60,7 +60,7 @@ INSTALL (
TARGETS
h5import
RUNTIME DESTINATION
bin/tools
${HDF5_INSTALL_BIN_DIR}/tools
COMPONENT
toolsapplications
)

2
tools/h5jam/CMakeLists.txt
View File

@ -83,7 +83,7 @@ INSTALL (
TARGETS
h5jam h5unjam
RUNTIME DESTINATION
bin/tools
${HDF5_INSTALL_BIN_DIR}/tools
COMPONENT
toolsapplications
)

2
tools/h5ls/CMakeLists.txt
View File

@ -270,7 +270,7 @@ INSTALL (
TARGETS
h5ls
RUNTIME DESTINATION
bin/tools
${HDF5_INSTALL_BIN_DIR}/tools
COMPONENT
toolsapplications
)

2
tools/h5repack/CMakeLists.txt
View File

@ -672,7 +672,7 @@ INSTALL (
TARGETS
h5repack
RUNTIME DESTINATION
bin/tools
${HDF5_INSTALL_BIN_DIR}/tools
COMPONENT
toolsapplications
)

2
tools/h5stat/CMakeLists.txt
View File

@ -145,7 +145,7 @@ INSTALL (
TARGETS
h5stat
RUNTIME DESTINATION
bin/tools
${HDF5_INSTALL_BIN_DIR}/tools
COMPONENT
toolsapplications
)

8
tools/lib/CMakeLists.txt
View File

@ -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)

2
tools/misc/CMakeLists.txt
View File

@ -130,7 +130,7 @@ INSTALL (
TARGETS
h5debug h5repart
RUNTIME DESTINATION
bin/tools
${HDF5_INSTALL_BIN_DIR}/tools
COMPONENT
toolsapplications
)