From ec688f92b94b9b6bdcfdc63058aef41fc5d97c0c Mon Sep 17 00:00:00 2001 From: Allen Byrne Date: Tue, 15 Nov 2011 12:53:00 -0500 Subject: [svn-r21763] HDFFV-7798: CMake on linux. Corrected path component in fortran/src and hl/fortran/src and the install command. --- fortran/src/CMakeLists.txt | 27 +++++++++++++++++++-------- hl/fortran/src/CMakeLists.txt | 27 +++++++++++++++++++-------- 2 files changed, 38 insertions(+), 16 deletions(-) diff --git a/fortran/src/CMakeLists.txt b/fortran/src/CMakeLists.txt index ec4d7d1..9a3b56c 100644 --- a/fortran/src/CMakeLists.txt +++ b/fortran/src/CMakeLists.txt @@ -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 diff --git a/hl/fortran/src/CMakeLists.txt b/hl/fortran/src/CMakeLists.txt index 1f37def..3febbeb 100644 --- a/hl/fortran/src/CMakeLists.txt +++ b/hl/fortran/src/CMakeLists.txt @@ -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 -- cgit v0.12