diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2014-04-02 18:35:01 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2014-04-02 18:35:01 (GMT) |
| commit | 98bbf4a36a2410fe0862c739370365a160053f17 (patch) | |
| tree | c07dd05d13fe3729d677ffe82be9d2a662035467 /hl/fortran/src | |
| parent | 5555f057ae4203b469cc22c6fc9bf886ff809343 (diff) | |
| download | hdf5-98bbf4a36a2410fe0862c739370365a160053f17.zip hdf5-98bbf4a36a2410fe0862c739370365a160053f17.tar.gz hdf5-98bbf4a36a2410fe0862c739370365a160053f17.tar.bz2 | |
[svn-r24948] Group tests by Common name
Remove WIN32 AND NOT CYGWIN if blocks - should be just WIN32
Tested: local linux CMake
Diffstat (limited to 'hl/fortran/src')
| -rw-r--r-- | hl/fortran/src/CMakeLists.txt | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/hl/fortran/src/CMakeLists.txt b/hl/fortran/src/CMakeLists.txt index a95873b..c5b2d57 100644 --- a/hl/fortran/src/CMakeLists.txt +++ b/hl/fortran/src/CMakeLists.txt @@ -49,7 +49,7 @@ set (HDF5_HL_F90_F_SRCS add_library (${HDF5_HL_F90_LIB_TARGET} ${LIB_TYPE} ${HDF5_HL_F90_F_SRCS}) set (SHARED_LINK_FLAGS " ") if (BUILD_SHARED_LIBS) - if (WIN32 AND NOT CYGWIN) + if (WIN32) set_property (TARGET ${HDF5_HL_F90_LIB_TARGET} APPEND PROPERTY COMPILE_DEFINITIONS BUILD_HDF5_DLL @@ -57,14 +57,14 @@ if (BUILD_SHARED_LIBS) if (MSVC) set (SHARED_LINK_FLAGS "/DLL") endif (MSVC) - endif (WIN32 AND NOT CYGWIN) + endif (WIN32) endif (BUILD_SHARED_LIBS) -if (WIN32 AND NOT CYGWIN) +if (WIN32) set_property (TARGET ${HDF5_HL_F90_LIB_TARGET} APPEND PROPERTY COMPILE_DEFINITIONS HDF5F90_WINDOWS ) -endif (WIN32 AND NOT CYGWIN) +endif (WIN32) TARGET_FORTRAN_PROPERTIES (${HDF5_HL_F90_LIB_TARGET} " " ${SHARED_LINK_FLAGS}) 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} ${HDF5_F90_LIB_TARGET}) @@ -78,7 +78,7 @@ set_target_properties (${HDF5_HL_F90_LIB_TARGET} PROPERTIES #----------------------------------------------------------------------------- # Add file(s) to CMake Install #----------------------------------------------------------------------------- -if (WIN32 AND NOT CYGWIN) +if (WIN32) install ( FILES ${CMAKE_Fortran_MODULE_DIRECTORY}/\${BUILD_TYPE}/h5ds.mod @@ -90,7 +90,7 @@ if (WIN32 AND NOT CYGWIN) COMPONENT fortheaders ) -else (WIN32 AND NOT CYGWIN) +else (WIN32) install ( FILES ${CMAKE_Fortran_MODULE_DIRECTORY}/h5ds.mod @@ -102,7 +102,7 @@ else (WIN32 AND NOT CYGWIN) COMPONENT fortheaders ) -endif (WIN32 AND NOT CYGWIN) +endif (WIN32) #----------------------------------------------------------------------------- # Add Target(s) to CMake Install for import into other projects |