diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2010-09-09 16:30:23 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2010-09-09 16:30:23 (GMT) |
| commit | bed127641399ec6c6e1479b7c394fd3a4eb56438 (patch) | |
| tree | bd923e43fb7c5a004a94f038b6c087d1d170f739 /fortran/test | |
| parent | a5b16bbd75dddc008480448d458cb0a1b7ba70fa (diff) | |
| download | hdf5-bed127641399ec6c6e1479b7c394fd3a4eb56438.zip hdf5-bed127641399ec6c6e1479b7c394fd3a4eb56438.tar.gz hdf5-bed127641399ec6c6e1479b7c394fd3a4eb56438.tar.bz2 | |
[svn-r19361] Move Windows specific compile and link flags to macros
Diffstat (limited to 'fortran/test')
| -rw-r--r-- | fortran/test/CMakeLists.txt | 52 |
1 files changed, 4 insertions, 48 deletions
diff --git a/fortran/test/CMakeLists.txt b/fortran/test/CMakeLists.txt index 26475e6..7c8c407 100644 --- a/fortran/test/CMakeLists.txt +++ b/fortran/test/CMakeLists.txt @@ -75,6 +75,7 @@ ADD_EXECUTABLE (testhdf5_fortran tH5Z.f90 ) H5_NAMING (testhdf5_fortran) +TARGET_FORTRAN_WIN_PROPERTIES (testhdf5_fortran) TARGET_LINK_LIBRARIES (testhdf5_fortran ${HDF5_F90_TEST_LIB_TARGET} ${HDF5_F90_LIB_TARGET} @@ -83,18 +84,6 @@ TARGET_LINK_LIBRARIES (testhdf5_fortran IF (WIN32) IF (MSVC) TARGET_LINK_LIBRARIES (testhdf5_fortran "ws2_32.lib") - IF (BUILD_SHARED_LIBS) - SET_TARGET_PROPERTIES (testhdf5_fortran - PROPERTIES - COMPILE_FLAGS "/dll" - LINK_FLAGS "/SUBSYSTEM:CONSOLE" - ) - ELSE (BUILD_SHARED_LIBS) - SET_TARGET_PROPERTIES (testhdf5_fortran - PROPERTIES - LINK_FLAGS "/NODEFAULTLIB:MSVCRT" - ) - ENDIF (BUILD_SHARED_LIBS) ENDIF (MSVC) ENDIF (WIN32) SET_TARGET_PROPERTIES (testhdf5_fortran PROPERTIES LINKER_LANGUAGE Fortran) @@ -110,6 +99,7 @@ ADD_EXECUTABLE (testhdf5_fortran_1_8 tH5G_1_8.f90 ) H5_NAMING (testhdf5_fortran_1_8) +TARGET_FORTRAN_WIN_PROPERTIES (testhdf5_fortran_1_8) TARGET_LINK_LIBRARIES (testhdf5_fortran_1_8 ${HDF5_F90_TEST_LIB_TARGET} ${HDF5_F90_LIB_TARGET} @@ -118,18 +108,6 @@ TARGET_LINK_LIBRARIES (testhdf5_fortran_1_8 IF (WIN32) IF (MSVC) TARGET_LINK_LIBRARIES (testhdf5_fortran_1_8 "ws2_32.lib") - IF (BUILD_SHARED_LIBS) - SET_TARGET_PROPERTIES (testhdf5_fortran_1_8 - PROPERTIES - COMPILE_FLAGS "/dll" - LINK_FLAGS "/SUBSYSTEM:CONSOLE" - ) - ELSE (BUILD_SHARED_LIBS) - SET_TARGET_PROPERTIES (testhdf5_fortran_1_8 - PROPERTIES - LINK_FLAGS "/NODEFAULTLIB:MSVCRT" - ) - ENDIF (BUILD_SHARED_LIBS) ENDIF (MSVC) ENDIF (WIN32) SET_TARGET_PROPERTIES (testhdf5_fortran_1_8 PROPERTIES LINKER_LANGUAGE Fortran) @@ -139,6 +117,7 @@ ADD_TEST (NAME testhdf5_fortran_1_8 COMMAND $<TARGET_FILE:testhdf5_fortran_1_8>) #-- Adding test for fflush1 ADD_EXECUTABLE (fflush1 fflush1.f90) H5_NAMING (fflush1) +TARGET_FORTRAN_WIN_PROPERTIES (fflush1) TARGET_LINK_LIBRARIES (fflush1 ${HDF5_F90_LIB_TARGET} ${HDF5_F90_TEST_LIB_TARGET} @@ -147,18 +126,6 @@ TARGET_LINK_LIBRARIES (fflush1 IF (WIN32) IF (MSVC) TARGET_LINK_LIBRARIES (fflush1 "ws2_32.lib") - IF (BUILD_SHARED_LIBS) - SET_TARGET_PROPERTIES (fflush1 - PROPERTIES - COMPILE_FLAGS "/dll" - LINK_FLAGS "/SUBSYSTEM:CONSOLE" - ) - ELSE (BUILD_SHARED_LIBS) - SET_TARGET_PROPERTIES (fflush1 - PROPERTIES - LINK_FLAGS "/NODEFAULTLIB:MSVCRT" - ) - ENDIF (BUILD_SHARED_LIBS) ENDIF (MSVC) ENDIF (WIN32) SET_TARGET_PROPERTIES (fflush1 PROPERTIES LINKER_LANGUAGE Fortran) @@ -168,6 +135,7 @@ ADD_TEST (NAME fflush1 COMMAND $<TARGET_FILE:fflush1>) #-- Adding test for fflush2 ADD_EXECUTABLE (fflush2 fflush2.f90) H5_NAMING (fflush2) +TARGET_FORTRAN_WIN_PROPERTIES (fflush2) TARGET_LINK_LIBRARIES (fflush2 ${HDF5_F90_TEST_LIB_TARGET} ${HDF5_F90_LIB_TARGET} @@ -176,18 +144,6 @@ TARGET_LINK_LIBRARIES (fflush2 IF (WIN32) IF (MSVC) TARGET_LINK_LIBRARIES (fflush2 "ws2_32.lib") - IF (BUILD_SHARED_LIBS) - SET_TARGET_PROPERTIES (fflush2 - PROPERTIES - COMPILE_FLAGS "/dll" - LINK_FLAGS "/SUBSYSTEM:CONSOLE" - ) - ELSE (BUILD_SHARED_LIBS) - SET_TARGET_PROPERTIES (fflush2 - PROPERTIES - LINK_FLAGS "/NODEFAULTLIB:MSVCRT" - ) - ENDIF (BUILD_SHARED_LIBS) ENDIF (MSVC) ENDIF (WIN32) SET_TARGET_PROPERTIES (fflush2 PROPERTIES LINKER_LANGUAGE Fortran) |