diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2018-05-03 16:57:30 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2018-05-03 16:57:30 (GMT) |
| commit | 1d1333ed6b51ef94862c50fe35fa52bea7756139 (patch) | |
| tree | 5f02c4417e0846210a5e8f6d1a8280436edfe75c /fortran/examples | |
| parent | 01a77cbfb17d8802a9f135bb95a2b2ec57f75410 (diff) | |
| download | hdf5-1d1333ed6b51ef94862c50fe35fa52bea7756139.zip hdf5-1d1333ed6b51ef94862c50fe35fa52bea7756139.tar.gz hdf5-1d1333ed6b51ef94862c50fe35fa52bea7756139.tar.bz2 | |
Revert to old style for LINK_FLAGS gen expr not working
Diffstat (limited to 'fortran/examples')
| -rw-r--r-- | fortran/examples/CMakeLists.txt | 35 |
1 files changed, 19 insertions, 16 deletions
diff --git a/fortran/examples/CMakeLists.txt b/fortran/examples/CMakeLists.txt index 5329e29..db1880b 100644 --- a/fortran/examples/CMakeLists.txt +++ b/fortran/examples/CMakeLists.txt @@ -47,12 +47,15 @@ foreach (example ${examples}) PRIVATE ${HDF5_F90_LIB_TARGET} ${HDF5_LIB_TARGET} ) - set_property(TARGET f90_ex_${example} APPEND_STRING PROPERTY - LINK_FLAGS $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:"-SUBSYSTEM:CONSOLE"> - ) - set_property(TARGET f90_ex_${example} APPEND_STRING PROPERTY - LINK_FLAGS $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:${WIN_LINK_FLAGS}> - ) +# set_property(TARGET f90_ex_${example} APPEND PROPERTY +# LINK_FLAGS $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:"-SUBSYSTEM:CONSOLE"> +# ) +# set_property(TARGET f90_ex_${example} APPEND PROPERTY +# LINK_FLAGS $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:> +# ) + if(MSVC) + set_property(TARGET H5_buildiface APPEND PROPERTY LINK_FLAGS "-SUBSYSTEM:CONSOLE;${WIN_LINK_FLAGS}") + endif() set_target_properties (f90_ex_${example} PROPERTIES LINKER_LANGUAGE Fortran FOLDER examples/fortran @@ -73,10 +76,10 @@ foreach (example ${examples}) PRIVATE ${HDF5_F90_LIBSH_TARGET} ${HDF5_LIBSH_TARGET} ) - set_property(TARGET f90_ex_${example}-shared APPEND_STRING PROPERTY + set_property(TARGET f90_ex_${example}-shared APPEND PROPERTY LINK_FLAGS $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:"-SUBSYSTEM:CONSOLE"> ) - set_property(TARGET f90_ex_${example}-shared APPEND_STRING PROPERTY + set_property(TARGET f90_ex_${example}-shared APPEND PROPERTY LINK_FLAGS $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:${WIN_LINK_FLAGS}> ) set_target_properties (f90_ex_${example}-shared PROPERTIES @@ -101,10 +104,10 @@ foreach (example ${F2003_examples}) PRIVATE ${HDF5_F90_LIB_TARGET} ${HDF5_LIB_TARGET} ) - set_property(TARGET f03_ex_${example} APPEND_STRING PROPERTY + set_property(TARGET f03_ex_${example} APPEND PROPERTY LINK_FLAGS $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:"-SUBSYSTEM:CONSOLE"> ) - set_property(TARGET f03_ex_${example} APPEND_STRING PROPERTY + set_property(TARGET f03_ex_${example} APPEND PROPERTY LINK_FLAGS $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:${WIN_LINK_FLAGS}> ) set_target_properties (f03_ex_${example} PROPERTIES @@ -127,10 +130,10 @@ foreach (example ${F2003_examples}) PRIVATE ${HDF5_F90_LIBSH_TARGET} ${HDF5_LIBSH_TARGET} ) - set_property(TARGET f03_ex_${example}-shared APPEND_STRING PROPERTY + set_property(TARGET f03_ex_${example}-shared APPEND PROPERTY LINK_FLAGS $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:"-SUBSYSTEM:CONSOLE"> ) - set_property(TARGET f03_ex_${example}-shared APPEND_STRING PROPERTY + set_property(TARGET f03_ex_${example}-shared APPEND PROPERTY LINK_FLAGS $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:${WIN_LINK_FLAGS}> ) set_target_properties (f03_ex_${example}-shared PROPERTIES @@ -155,10 +158,10 @@ if (H5_HAVE_PARALLEL AND MPI_Fortran_FOUND) PRIVATE ${HDF5_F90_LIB_TARGET} ${HDF5_LIB_TARGET} ) - set_property(TARGET f90_ex_ph5example APPEND_STRING PROPERTY + set_property(TARGET f90_ex_ph5example APPEND PROPERTY LINK_FLAGS $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:"-SUBSYSTEM:CONSOLE"> ) - set_property(TARGET f90_ex_ph5example APPEND_STRING PROPERTY + set_property(TARGET f90_ex_ph5example APPEND PROPERTY LINK_FLAGS $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:${WIN_LINK_FLAGS}> ) set_target_properties (f90_ex_ph5example PROPERTIES @@ -181,10 +184,10 @@ if (H5_HAVE_PARALLEL AND MPI_Fortran_FOUND) PRIVATE ${HDF5_F90_LIBSH_TARGET} ${HDF5_LIBSH_TARGET} ) - set_property(TARGET f90_ex_ph5example-shared APPEND_STRING PROPERTY + set_property(TARGET f90_ex_ph5example-shared APPEND PROPERTY LINK_FLAGS $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:"-SUBSYSTEM:CONSOLE"> ) - set_property(TARGET f90_ex_ph5example-shared APPEND_STRING PROPERTY + set_property(TARGET f90_ex_ph5example-shared APPEND PROPERTY LINK_FLAGS $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:${WIN_LINK_FLAGS}> ) set_target_properties (f90_ex_ph5example-shared PROPERTIES |