[svn-r21764] HDFFV-7798: CMake on linux. Corrected path component in fortran/src and hl/fortran/src and the install command.

This commit is contained in:
Allen Byrne 2011-11-15 12:54:18 -05:00
parent ab7b2c0fc0
commit d3225c4f39
2 changed files with 38 additions and 16 deletions

View File

@ -243,14 +243,25 @@ INSTALL (
fortheaders
)
INSTALL (
DIRECTORY
${CMAKE_Fortran_MODULE_DIRECTORY}/\${BUILD_TYPE}/
DESTINATION
${HDF5_INSTALL_INCLUDE_DIR}/fortran
COMPONENT
fortheaders
)
IF (WIN32 AND NOT CYGWIN)
INSTALL (
DIRECTORY
${CMAKE_Fortran_MODULE_DIRECTORY}/\${BUILD_TYPE}/
DESTINATION
${HDF5_INSTALL_INCLUDE_DIR}/fortran
COMPONENT
fortheaders
)
ELSE (WIN32 AND NOT CYGWIN)
INSTALL (
DIRECTORY
${CMAKE_Fortran_MODULE_DIRECTORY}/
DESTINATION
${HDF5_INSTALL_INCLUDE_DIR}/fortran
COMPONENT
fortheaders
)
ENDIF (WIN32 AND NOT CYGWIN)
#-----------------------------------------------------------------------------
# Add Target(s) to CMake Install for import into other projects

View File

@ -71,14 +71,25 @@ SET_TARGET_PROPERTIES (${HDF5_HL_F90_LIB_TARGET} PROPERTIES FOLDER libraries/hl/
#-----------------------------------------------------------------------------
# Add file(s) to CMake Install
#-----------------------------------------------------------------------------
INSTALL (
DIRECTORY
${CMAKE_Fortran_MODULE_DIRECTORY}/\${BUILD_TYPE}/
DESTINATION
${HDF5_INSTALL_INCLUDE_DIR}/fortran
COMPONENT
fortheaders
)
IF (WIN32 AND NOT CYGWIN)
INSTALL (
DIRECTORY
${CMAKE_Fortran_MODULE_DIRECTORY}/\${BUILD_TYPE}/
DESTINATION
${HDF5_INSTALL_INCLUDE_DIR}/fortran
COMPONENT
fortheaders
)
ELSE (WIN32 AND NOT CYGWIN)
INSTALL (
DIRECTORY
${CMAKE_Fortran_MODULE_DIRECTORY}/
DESTINATION
${HDF5_INSTALL_INCLUDE_DIR}/fortran
COMPONENT
fortheaders
)
ENDIF (WIN32 AND NOT CYGWIN)
#-----------------------------------------------------------------------------
# Add Target(s) to CMake Install for import into other projects