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 /hl/fortran | |
| 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 'hl/fortran')
| -rw-r--r-- | hl/fortran/examples/CMakeLists.txt | 17 | ||||
| -rw-r--r-- | hl/fortran/test/CMakeLists.txt | 51 |
2 files changed, 4 insertions, 64 deletions
diff --git a/hl/fortran/examples/CMakeLists.txt b/hl/fortran/examples/CMakeLists.txt index 3ba6969..5e20da3 100644 --- a/hl/fortran/examples/CMakeLists.txt +++ b/hl/fortran/examples/CMakeLists.txt @@ -19,22 +19,7 @@ SET (examples FOREACH (example ${examples}) ADD_EXECUTABLE (hl_f90_ex_${example} ${HDF5_HL_F90_EXAMPLES_SOURCE_DIR}/${example}.f90) H5_NAMING (hl_f90_ex_${example}) - IF (WIN32) - IF (MSVC) - IF (BUILD_SHARED_LIBS) - SET_TARGET_PROPERTIES (hl_f90_ex_${example} - PROPERTIES - COMPILE_FLAGS "/dll" - LINK_FLAGS "/SUBSYSTEM:CONSOLE" - ) - ELSE (BUILD_SHARED_LIBS) - SET_TARGET_PROPERTIES (hl_f90_ex_${example} - PROPERTIES - LINK_FLAGS "/NODEFAULTLIB:MSVCRT" - ) - ENDIF (BUILD_SHARED_LIBS) - ENDIF (MSVC) - ENDIF (WIN32) + TARGET_FORTRAN_WIN_PROPERTIES (hl_f90_ex_${example}) TARGET_LINK_LIBRARIES (hl_f90_ex_${example} ${HDF5_HL_F90_LIB_TARGET} ${HDF5_F90_LIB_TARGET} diff --git a/hl/fortran/test/CMakeLists.txt b/hl/fortran/test/CMakeLists.txt index f505dbd..b4f4075 100644 --- a/hl/fortran/test/CMakeLists.txt +++ b/hl/fortran/test/CMakeLists.txt @@ -15,22 +15,7 @@ LINK_DIRECTORIES ( #-- Adding test for hl_f90_tstlite ADD_EXECUTABLE (hl_f90_tstlite tstlite.f90) H5_NAMING (hl_f90_tstlite) -IF (WIN32) - IF (MSVC) - IF (BUILD_SHARED_LIBS) - SET_TARGET_PROPERTIES (hl_f90_tstlite - PROPERTIES - COMPILE_FLAGS "/dll" - LINK_FLAGS "/SUBSYSTEM:CONSOLE" - ) - ELSE (BUILD_SHARED_LIBS) - SET_TARGET_PROPERTIES (hl_f90_tstlite - PROPERTIES - LINK_FLAGS "/NODEFAULTLIB:MSVCRT" - ) - ENDIF (BUILD_SHARED_LIBS) - ENDIF (MSVC) -ENDIF (WIN32) +TARGET_FORTRAN_WIN_PROPERTIES (hl_f90_tstlite) TARGET_LINK_LIBRARIES (hl_f90_tstlite ${HDF5_HL_F90_LIB_TARGET} ${HDF5_F90_LIB_TARGET}) SET_TARGET_PROPERTIES (hl_f90_tstlite PROPERTIES LINKER_LANGUAGE Fortran) @@ -39,22 +24,7 @@ ADD_TEST (NAME hl_f90_tstlite COMMAND $<TARGET_FILE:hl_f90_tstlite>) #-- Adding test for hl_f90_tstimage ADD_EXECUTABLE (hl_f90_tstimage tstimage.f90) H5_NAMING (hl_f90_tstimage) -IF (WIN32) - IF (MSVC) - IF (BUILD_SHARED_LIBS) - SET_TARGET_PROPERTIES (hl_f90_tstimage - PROPERTIES - COMPILE_FLAGS "/dll" - LINK_FLAGS "/SUBSYSTEM:CONSOLE" - ) - ELSE (BUILD_SHARED_LIBS) - SET_TARGET_PROPERTIES (hl_f90_tstimage - PROPERTIES - LINK_FLAGS "/NODEFAULTLIB:MSVCRT" - ) - ENDIF (BUILD_SHARED_LIBS) - ENDIF (MSVC) -ENDIF (WIN32) +TARGET_FORTRAN_WIN_PROPERTIES (hl_f90_tstimage) TARGET_LINK_LIBRARIES (hl_f90_tstimage ${HDF5_HL_F90_LIB_TARGET} ${HDF5_F90_LIB_TARGET}) SET_TARGET_PROPERTIES (hl_f90_tstimage PROPERTIES LINKER_LANGUAGE Fortran) @@ -63,22 +33,7 @@ ADD_TEST (NAME hl_f90_tstimage COMMAND $<TARGET_FILE:hl_f90_tstimage>) #-- Adding test for hl_f90_tsttable ADD_EXECUTABLE (hl_f90_tsttable tsttable.f90) H5_NAMING (hl_f90_tsttable) -IF (WIN32) - IF (MSVC) - IF (BUILD_SHARED_LIBS) - SET_TARGET_PROPERTIES (hl_f90_tsttable - PROPERTIES - COMPILE_FLAGS "/dll" - LINK_FLAGS "/SUBSYSTEM:CONSOLE" - ) - ELSE (BUILD_SHARED_LIBS) - SET_TARGET_PROPERTIES (hl_f90_tsttable - PROPERTIES - LINK_FLAGS "/NODEFAULTLIB:MSVCRT" - ) - ENDIF (BUILD_SHARED_LIBS) - ENDIF (MSVC) -ENDIF (WIN32) +TARGET_FORTRAN_WIN_PROPERTIES (hl_f90_tsttable) TARGET_LINK_LIBRARIES (hl_f90_tsttable ${HDF5_HL_F90_LIB_TARGET} ${HDF5_F90_LIB_TARGET}) SET_TARGET_PROPERTIES (hl_f90_tsttable PROPERTIES LINKER_LANGUAGE Fortran) |