diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2010-10-04 21:41:03 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2010-10-04 21:41:03 (GMT) |
| commit | 694c9065e06b7518999e9839cb38e1215aa7b39a (patch) | |
| tree | 4a81c0076c699b9d33931f71cd383bbc3a201813 /hl | |
| parent | 0574011fe87d79953d44d0824b0d0da5386b9060 (diff) | |
| download | hdf5-694c9065e06b7518999e9839cb38e1215aa7b39a.zip hdf5-694c9065e06b7518999e9839cb38e1215aa7b39a.tar.gz hdf5-694c9065e06b7518999e9839cb38e1215aa7b39a.tar.bz2 | |
[svn-r19510] Improve CMake support for CYGWIN.
Correct script comment in testh5diff.sh
Bring r19509 back from trunk
Tested: Windows Cygwin
Diffstat (limited to 'hl')
| -rw-r--r-- | hl/fortran/src/CMakeLists.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/hl/fortran/src/CMakeLists.txt b/hl/fortran/src/CMakeLists.txt index 67871f4..421fdff 100644 --- a/hl/fortran/src/CMakeLists.txt +++ b/hl/fortran/src/CMakeLists.txt @@ -52,7 +52,7 @@ H5_SET_LIB_OPTIONS (${HDF5_HL_F90_C_LIB_TARGET} ${HDF5_HL_F90_C_LIB_NAME} ${LIB_ ADD_LIBRARY (${HDF5_HL_F90_LIB_TARGET} ${LIB_TYPE} ${HDF5_HL_F90_F_SRCS}) IF (BUILD_SHARED_LIBS) - IF (WIN32) + IF (WIN32 AND NOT CYGWIN) SET_PROPERTY (TARGET ${HDF5_HL_F90_LIB_TARGET} APPEND PROPERTY COMPILE_DEFINITIONS BUILD_HDF5_DLL @@ -64,14 +64,14 @@ IF (BUILD_SHARED_LIBS) LINK_FLAGS "/SUBSYSTEM:CONSOLE /DLL" ) ENDIF (MSVC) - ENDIF (WIN32) + ENDIF (WIN32 AND NOT CYGWIN) ENDIF (BUILD_SHARED_LIBS) -IF (WIN32) +IF (WIN32 AND NOT CYGWIN) SET_PROPERTY (TARGET ${HDF5_HL_F90_LIB_TARGET} APPEND PROPERTY COMPILE_DEFINITIONS HDF5F90_WINDOWS ) -ENDIF (WIN32) +ENDIF (WIN32 AND NOT CYGWIN) SET_TARGET_PROPERTIES (${HDF5_HL_F90_LIB_TARGET} PROPERTIES LINKER_LANGUAGE Fortran) TARGET_LINK_LIBRARIES (${HDF5_HL_F90_LIB_TARGET} ${HDF5_HL_F90_C_LIB_TARGET} |