From 6fcf4c9aeb12edf206e5d548f6f060fb979d4fbb Mon Sep 17 00:00:00 2001 From: Allen Byrne Date: Thu, 3 May 2018 15:41:50 -0500 Subject: Remove APPEND --- config/cmake/UserMacros/Windows_MT.cmake | 2 +- fortran/examples/CMakeLists.txt | 38 ++++++++++++++++++-------------- fortran/src/CMakeLists.txt | 6 ++--- fortran/test/CMakeLists.txt | 26 +++++++++++----------- fortran/testpar/CMakeLists.txt | 2 +- hl/fortran/examples/CMakeLists.txt | 2 +- hl/fortran/src/CMakeLists.txt | 6 ++--- hl/fortran/test/CMakeLists.txt | 4 ++-- 8 files changed, 46 insertions(+), 40 deletions(-) diff --git a/config/cmake/UserMacros/Windows_MT.cmake b/config/cmake/UserMacros/Windows_MT.cmake index ea95908..b6cc513 100644 --- a/config/cmake/UserMacros/Windows_MT.cmake +++ b/config/cmake/UserMacros/Windows_MT.cmake @@ -40,7 +40,7 @@ macro (TARGET_STATIC_CRT_FLAGS) endif () endforeach () set (WIN_COMPILE_FLAGS "") - set (WIN_LINK_FLAGS "-NODEFAULTLIB:MSVCRT") + set (WIN_LINK_FLAGS "/NODEFAULTLIB:MSVCRT") endif () endmacro () diff --git a/fortran/examples/CMakeLists.txt b/fortran/examples/CMakeLists.txt index 1b7e4f0..8b1ba60 100644 --- a/fortran/examples/CMakeLists.txt +++ b/fortran/examples/CMakeLists.txt @@ -54,7 +54,7 @@ foreach (example ${examples}) # LINK_FLAGS $<$:> # ) if(MSVC) - set_property(TARGET H5_buildiface APPEND PROPERTY LINK_FLAGS "-SUBSYSTEM:CONSOLE;${WIN_LINK_FLAGS}") + set_property(TARGET H5_buildiface PROPERTY LINK_FLAGS "/SUBSYSTEM:CONSOLE;${WIN_LINK_FLAGS}") endif() set_target_properties (f90_ex_${example} PROPERTIES LINKER_LANGUAGE Fortran @@ -83,7 +83,7 @@ foreach (example ${examples}) # LINK_FLAGS $<$:${WIN_LINK_FLAGS}> # ) if(MSVC) - set_property(TARGET f90_ex_${example}-shared APPEND PROPERTY LINK_FLAGS "-SUBSYSTEM:CONSOLE;${WIN_LINK_FLAGS}") + set_property(TARGET f90_ex_${example}-shared PROPERTY LINK_FLAGS "/SUBSYSTEM:CONSOLE;${WIN_LINK_FLAGS}") endif() set_target_properties (f90_ex_${example}-shared PROPERTIES LINKER_LANGUAGE Fortran @@ -114,7 +114,7 @@ foreach (example ${F2003_examples}) # LINK_FLAGS $<$:${WIN_LINK_FLAGS}> # ) if(MSVC) - set_property(TARGET f03_ex_${example} APPEND PROPERTY LINK_FLAGS "-SUBSYSTEM:CONSOLE;${WIN_LINK_FLAGS}") + set_property(TARGET f03_ex_${example} PROPERTY LINK_FLAGS "/SUBSYSTEM:CONSOLE;${WIN_LINK_FLAGS}") endif() set_target_properties (f03_ex_${example} PROPERTIES LINKER_LANGUAGE Fortran @@ -143,7 +143,7 @@ foreach (example ${F2003_examples}) # LINK_FLAGS $<$:${WIN_LINK_FLAGS}> # ) if(MSVC) - set_property(TARGET f03_ex_${example}-shared APPEND PROPERTY LINK_FLAGS "-SUBSYSTEM:CONSOLE;${WIN_LINK_FLAGS}") + set_property(TARGET f03_ex_${example}-shared PROPERTY LINK_FLAGS "/SUBSYSTEM:CONSOLE;${WIN_LINK_FLAGS}") endif() set_target_properties (f03_ex_${example}-shared PROPERTIES LINKER_LANGUAGE Fortran @@ -167,12 +167,15 @@ if (H5_HAVE_PARALLEL AND MPI_Fortran_FOUND) PRIVATE ${HDF5_F90_LIB_TARGET} ${HDF5_LIB_TARGET} ) - set_property(TARGET f90_ex_ph5example APPEND PROPERTY - LINK_FLAGS $<$:"-SUBSYSTEM:CONSOLE"> - ) - set_property(TARGET f90_ex_ph5example APPEND PROPERTY - LINK_FLAGS $<$:${WIN_LINK_FLAGS}> - ) +# set_property(TARGET f90_ex_ph5example APPEND PROPERTY +# LINK_FLAGS $<$:"-SUBSYSTEM:CONSOLE"> +# ) +# set_property(TARGET f90_ex_ph5example APPEND PROPERTY +# LINK_FLAGS $<$:${WIN_LINK_FLAGS}> +# ) + if(MSVC) + set_property(TARGET f90_ex_ph5example PROPERTY LINK_FLAGS "/SUBSYSTEM:CONSOLE;${WIN_LINK_FLAGS}") + endif() set_target_properties (f90_ex_ph5example PROPERTIES LINKER_LANGUAGE Fortran FOLDER examples/fortran @@ -193,12 +196,15 @@ if (H5_HAVE_PARALLEL AND MPI_Fortran_FOUND) PRIVATE ${HDF5_F90_LIBSH_TARGET} ${HDF5_LIBSH_TARGET} ) - set_property(TARGET f90_ex_ph5example-shared APPEND PROPERTY - LINK_FLAGS $<$:"-SUBSYSTEM:CONSOLE"> - ) - set_property(TARGET f90_ex_ph5example-shared APPEND PROPERTY - LINK_FLAGS $<$:${WIN_LINK_FLAGS}> - ) +# set_property(TARGET f90_ex_ph5example-shared APPEND PROPERTY +# LINK_FLAGS $<$:"-SUBSYSTEM:CONSOLE"> +# ) +# set_property(TARGET f90_ex_ph5example-shared APPEND PROPERTY +# LINK_FLAGS $<$:${WIN_LINK_FLAGS}> +# ) + if(MSVC) + set_property(TARGET f90_ex_ph5example-shared PROPERTY LINK_FLAGS "/SUBSYSTEM:CONSOLE;${WIN_LINK_FLAGS}") + endif() set_target_properties (f90_ex_ph5example-shared PROPERTIES LINKER_LANGUAGE Fortran FOLDER examples/fortran diff --git a/fortran/src/CMakeLists.txt b/fortran/src/CMakeLists.txt index cafcbce..e630340 100644 --- a/fortran/src/CMakeLists.txt +++ b/fortran/src/CMakeLists.txt @@ -58,7 +58,7 @@ endif () # LINK_FLAGS $<$:"-SUBSYSTEM:CONSOLE"> #) if(MSVC) - set_property(TARGET H5_buildiface APPEND PROPERTY LINK_FLAGS "-SUBSYSTEM:CONSOLE") + set_property(TARGET H5_buildiface PROPERTY LINK_FLAGS "/SUBSYSTEM:CONSOLE") endif() set_target_properties (H5_buildiface PROPERTIES @@ -277,7 +277,7 @@ target_link_libraries (${HDF5_F90_LIB_TARGET} # LINK_FLAGS $<$:${WIN_LINK_FLAGS}> #) if(MSVC) - set_property(TARGET ${HDF5_F90_LIB_TARGET} APPEND PROPERTY LINK_FLAGS "-SUBSYSTEM:CONSOLE;${WIN_LINK_FLAGS}") + set_property(TARGET ${HDF5_F90_LIB_TARGET} PROPERTY LINK_FLAGS "/SUBSYSTEM:CONSOLE;${WIN_LINK_FLAGS}") endif() set_target_properties (${HDF5_F90_LIB_TARGET} PROPERTIES FOLDER libraries/fortran @@ -324,7 +324,7 @@ if (BUILD_SHARED_LIBS) # LINK_FLAGS $<$:"-DEF:${HDF5_F90_SRC_BINARY_DIR}/hdf5_fortrandll.def"> # ) if(MSVC) - set_property(TARGET ${HDF5_F90_LIBSH_TARGET} APPEND PROPERTY LINK_FLAGS "-SUBSYSTEM:CONSOLE;${WIN_LINK_FLAGS};-DLL;-DEF:${HDF5_F90_SRC_BINARY_DIR}/hdf5_fortrandll.def") + set_property(TARGET ${HDF5_F90_LIBSH_TARGET} PROPERTY LINK_FLAGS "/SUBSYSTEM:CONSOLE;${WIN_LINK_FLAGS};/DLL;/DEF:${HDF5_F90_SRC_BINARY_DIR}/hdf5_fortrandll.def") endif() set_target_properties (${HDF5_F90_LIBSH_TARGET} PROPERTIES FOLDER libraries/fortran diff --git a/fortran/test/CMakeLists.txt b/fortran/test/CMakeLists.txt index f8d10a3..60b5427 100644 --- a/fortran/test/CMakeLists.txt +++ b/fortran/test/CMakeLists.txt @@ -21,7 +21,7 @@ endif () # LINK_FLAGS $<$:"-SUBSYSTEM:CONSOLE"> #) if(MSVC) - set_property(TARGET H5_test_buildiface APPEND PROPERTY LINK_FLAGS "-SUBSYSTEM:CONSOLE") + set_property(TARGET H5_test_buildiface PROPERTY LINK_FLAGS "/SUBSYSTEM:CONSOLE") endif() set_target_properties (H5_test_buildiface PROPERTIES LINKER_LANGUAGE Fortran @@ -143,7 +143,7 @@ target_link_libraries (${HDF5_F90_TEST_LIB_TARGET} # LINK_FLAGS $<$:${WIN_LINK_FLAGS}> #) if(MSVC) - set_property(TARGET ${HDF5_F90_TEST_LIB_TARGET} APPEND PROPERTY LINK_FLAGS "-SUBSYSTEM:CONSOLE;${WIN_LINK_FLAGS}") + set_property(TARGET ${HDF5_F90_TEST_LIB_TARGET} PROPERTY LINK_FLAGS "/SUBSYSTEM:CONSOLE;${WIN_LINK_FLAGS}") endif() set_target_properties (${HDF5_F90_TEST_LIB_TARGET} PROPERTIES FOLDER libraries/test/fortran @@ -183,7 +183,7 @@ if (BUILD_SHARED_LIBS) # LINK_FLAGS $<$:"-DLL"> # ) if(MSVC) - set_property(TARGET ${HDF5_F90_TEST_LIBSH_TARGET} APPEND PROPERTY LINK_FLAGS "-SUBSYSTEM:CONSOLE;${WIN_LINK_FLAGS};-DLL") + set_property(TARGET ${HDF5_F90_TEST_LIBSH_TARGET} PROPERTY LINK_FLAGS "/SUBSYSTEM:CONSOLE;${WIN_LINK_FLAGS};-DLL") endif() set_target_properties (${HDF5_F90_TEST_LIBSH_TARGET} PROPERTIES FOLDER libraries/test/fortran @@ -235,7 +235,7 @@ target_link_libraries (testhdf5_fortran # LINK_FLAGS $<$:${WIN_LINK_FLAGS}> #) if(MSVC) - set_property(TARGET testhdf5_fortran APPEND PROPERTY LINK_FLAGS "-SUBSYSTEM:CONSOLE;${WIN_LINK_FLAGS}") + set_property(TARGET testhdf5_fortran PROPERTY LINK_FLAGS "/SUBSYSTEM:CONSOLE;${WIN_LINK_FLAGS}") endif() set_target_properties (testhdf5_fortran PROPERTIES LINKER_LANGUAGE Fortran @@ -282,7 +282,7 @@ if (BUILD_SHARED_LIBS) # LINK_FLAGS $<$:${WIN_LINK_FLAGS}> # ) if(MSVC) - set_property(TARGET testhdf5_fortran-shared APPEND PROPERTY LINK_FLAGS "-SUBSYSTEM:CONSOLE;${WIN_LINK_FLAGS}") + set_property(TARGET testhdf5_fortran-shared PROPERTY LINK_FLAGS "/SUBSYSTEM:CONSOLE;${WIN_LINK_FLAGS}") endif() set_target_properties (testhdf5_fortran-shared PROPERTIES LINKER_LANGUAGE Fortran @@ -320,7 +320,7 @@ target_link_libraries (testhdf5_fortran_1_8 # LINK_FLAGS $<$:${WIN_LINK_FLAGS}> #) if(MSVC) - set_property(TARGET testhdf5_fortran_1_8 APPEND PROPERTY LINK_FLAGS "-SUBSYSTEM:CONSOLE;${WIN_LINK_FLAGS}") + set_property(TARGET testhdf5_fortran_1_8 PROPERTY LINK_FLAGS "/SUBSYSTEM:CONSOLE;${WIN_LINK_FLAGS}") endif() set_target_properties (testhdf5_fortran_1_8 PROPERTIES LINKER_LANGUAGE Fortran @@ -358,7 +358,7 @@ if (BUILD_SHARED_LIBS) # LINK_FLAGS $<$:${WIN_LINK_FLAGS}> # ) if(MSVC) - set_property(TARGET testhdf5_fortran_1_8-shared APPEND PROPERTY LINK_FLAGS "-SUBSYSTEM:CONSOLE;${WIN_LINK_FLAGS}") + set_property(TARGET testhdf5_fortran_1_8-shared PROPERTY LINK_FLAGS "/SUBSYSTEM:CONSOLE;${WIN_LINK_FLAGS}") endif() set_target_properties (testhdf5_fortran_1_8-shared PROPERTIES LINKER_LANGUAGE Fortran @@ -398,7 +398,7 @@ target_link_libraries (fortranlib_test_F03 # LINK_FLAGS $<$:${WIN_LINK_FLAGS}> #) if(MSVC) - set_property(TARGET fortranlib_test_F03 APPEND PROPERTY LINK_FLAGS "-SUBSYSTEM:CONSOLE;${WIN_LINK_FLAGS}") + set_property(TARGET fortranlib_test_F03 PROPERTY LINK_FLAGS "/SUBSYSTEM:CONSOLE;${WIN_LINK_FLAGS}") endif() set_target_properties (fortranlib_test_F03 PROPERTIES LINKER_LANGUAGE Fortran @@ -438,7 +438,7 @@ if (BUILD_SHARED_LIBS) # LINK_FLAGS $<$:${WIN_LINK_FLAGS}> # ) if(MSVC) - set_property(TARGET fortranlib_test_F03-shared APPEND PROPERTY LINK_FLAGS "-SUBSYSTEM:CONSOLE;${WIN_LINK_FLAGS}") + set_property(TARGET fortranlib_test_F03-shared PROPERTY LINK_FLAGS "/SUBSYSTEM:CONSOLE;${WIN_LINK_FLAGS}") endif() set_target_properties (fortranlib_test_F03-shared PROPERTIES LINKER_LANGUAGE Fortran @@ -469,7 +469,7 @@ target_link_libraries (fflush1 # LINK_FLAGS $<$:${WIN_LINK_FLAGS}> #) if(MSVC) - set_property(TARGET fflush1 APPEND PROPERTY LINK_FLAGS "-SUBSYSTEM:CONSOLE;${WIN_LINK_FLAGS}") + set_property(TARGET fflush1 PROPERTY LINK_FLAGS "/SUBSYSTEM:CONSOLE;${WIN_LINK_FLAGS}") endif() set_target_properties (fflush1 PROPERTIES LINKER_LANGUAGE Fortran @@ -500,7 +500,7 @@ if (BUILD_SHARED_LIBS) # LINK_FLAGS $<$:${WIN_LINK_FLAGS}> # ) if(MSVC) - set_property(TARGET fflush1-shared APPEND PROPERTY LINK_FLAGS "-SUBSYSTEM:CONSOLE;${WIN_LINK_FLAGS}") + set_property(TARGET fflush1-shared PROPERTY LINK_FLAGS "/SUBSYSTEM:CONSOLE;${WIN_LINK_FLAGS}") endif() set_target_properties (fflush1-shared PROPERTIES LINKER_LANGUAGE Fortran @@ -531,7 +531,7 @@ target_link_libraries (fflush2 # LINK_FLAGS $<$:${WIN_LINK_FLAGS}> #) if(MSVC) - set_property(TARGET fflush2 APPEND PROPERTY LINK_FLAGS "-SUBSYSTEM:CONSOLE;${WIN_LINK_FLAGS}") + set_property(TARGET fflush2 PROPERTY LINK_FLAGS "/SUBSYSTEM:CONSOLE;${WIN_LINK_FLAGS}") endif() set_target_properties (fflush2 PROPERTIES LINKER_LANGUAGE Fortran @@ -562,7 +562,7 @@ if (BUILD_SHARED_LIBS) # LINK_FLAGS $<$:${WIN_LINK_FLAGS}> # ) if(MSVC) - set_property(TARGET fflush2-shared APPEND PROPERTY LINK_FLAGS "-SUBSYSTEM:CONSOLE;${WIN_LINK_FLAGS}") + set_property(TARGET fflush2-shared PROPERTY LINK_FLAGS "/SUBSYSTEM:CONSOLE;${WIN_LINK_FLAGS}") endif() set_target_properties (fflush2-shared PROPERTIES LINKER_LANGUAGE Fortran diff --git a/fortran/testpar/CMakeLists.txt b/fortran/testpar/CMakeLists.txt index c53f724..9b74ec8 100644 --- a/fortran/testpar/CMakeLists.txt +++ b/fortran/testpar/CMakeLists.txt @@ -36,7 +36,7 @@ target_link_libraries (parallel_test # LINK_FLAGS $<$:${WIN_LINK_FLAGS}> #) if(MSVC) - set_property(TARGET parallel_test APPEND PROPERTY LINK_FLAGS "-SUBSYSTEM:CONSOLE;${WIN_LINK_FLAGS}") + set_property(TARGET parallel_test PROPERTY LINK_FLAGS "/SUBSYSTEM:CONSOLE;${WIN_LINK_FLAGS}") endif() set_target_properties (parallel_test PROPERTIES FOLDER test/fortran diff --git a/hl/fortran/examples/CMakeLists.txt b/hl/fortran/examples/CMakeLists.txt index bd33a19..18f8248 100644 --- a/hl/fortran/examples/CMakeLists.txt +++ b/hl/fortran/examples/CMakeLists.txt @@ -27,7 +27,7 @@ foreach (example ${examples}) # LINK_FLAGS $<$:${WIN_LINK_FLAGS}> # ) if(MSVC) - set_property(TARGET hl_f90_ex_${example} APPEND PROPERTY LINK_FLAGS "-SUBSYSTEM:CONSOLE;${WIN_LINK_FLAGS}") + set_property(TARGET hl_f90_ex_${example} PROPERTY LINK_FLAGS "/SUBSYSTEM:CONSOLE;${WIN_LINK_FLAGS}") endif() set_target_properties (hl_f90_ex_${example} PROPERTIES LINKER_LANGUAGE Fortran diff --git a/hl/fortran/src/CMakeLists.txt b/hl/fortran/src/CMakeLists.txt index a7b760d..0654194 100644 --- a/hl/fortran/src/CMakeLists.txt +++ b/hl/fortran/src/CMakeLists.txt @@ -26,7 +26,7 @@ endif () # LINK_FLAGS $<$:"-SUBSYSTEM:CONSOLE"> #) if(MSVC) - set_property(TARGET H5HL_buildiface APPEND PROPERTY LINK_FLAGS "-SUBSYSTEM:CONSOLE") + set_property(TARGET H5HL_buildiface PROPERTY LINK_FLAGS "/SUBSYSTEM:CONSOLE") endif() set_target_properties (H5HL_buildiface PROPERTIES LINKER_LANGUAGE Fortran @@ -176,7 +176,7 @@ target_link_libraries (${HDF5_HL_F90_LIB_TARGET} # LINK_FLAGS $<$:${WIN_LINK_FLAGS}> #) if(MSVC) - set_property(TARGET ${HDF5_HL_F90_LIB_TARGET} APPEND PROPERTY LINK_FLAGS "-SUBSYSTEM:CONSOLE;${WIN_LINK_FLAGS}") + set_property(TARGET ${HDF5_HL_F90_LIB_TARGET} PROPERTY LINK_FLAGS "/SUBSYSTEM:CONSOLE;${WIN_LINK_FLAGS}") endif() set_target_properties (${HDF5_HL_F90_LIB_TARGET} PROPERTIES FOLDER libraries/hl/fortran @@ -223,7 +223,7 @@ if (BUILD_SHARED_LIBS) # LINK_FLAGS $<$:"-DEF:${HDF5_HL_F90_SRC_BINARY_DIR}/hdf5_hl_fortrandll.def"> # ) if(MSVC) - set_property(TARGET ${HDF5_HL_F90_LIBSH_TARGET} APPEND PROPERTY LINK_FLAGS "-SUBSYSTEM:CONSOLE;${WIN_LINK_FLAGS};-DLL;-DEF:${HDF5_HL_F90_SRC_BINARY_DIR}/hdf5_hl_fortrandll.def") + set_property(TARGET ${HDF5_HL_F90_LIBSH_TARGET} PROPERTY LINK_FLAGS "/SUBSYSTEM:CONSOLE;${WIN_LINK_FLAGS};-DLL;-DEF:${HDF5_HL_F90_SRC_BINARY_DIR}/hdf5_hl_fortrandll.def") endif() set_target_properties (${HDF5_HL_F90_LIBSH_TARGET} PROPERTIES FOLDER libraries/hl/fortran diff --git a/hl/fortran/test/CMakeLists.txt b/hl/fortran/test/CMakeLists.txt index 61705e2..ea218da 100644 --- a/hl/fortran/test/CMakeLists.txt +++ b/hl/fortran/test/CMakeLists.txt @@ -32,7 +32,7 @@ macro (ADD_H5_FORTRAN_EXE file) # LINK_FLAGS $<$:${WIN_LINK_FLAGS}> # ) if(MSVC) - set_property(TARGET hl_f90_${file} APPEND PROPERTY LINK_FLAGS "-SUBSYSTEM:CONSOLE;${WIN_LINK_FLAGS}") + set_property(TARGET hl_f90_${file} PROPERTY LINK_FLAGS "/SUBSYSTEM:CONSOLE;${WIN_LINK_FLAGS}") endif() set_target_properties (hl_f90_${file} PROPERTIES LINKER_LANGUAGE Fortran @@ -60,7 +60,7 @@ macro (ADD_H5_FORTRAN_EXE file) # LINK_FLAGS $<$:${WIN_LINK_FLAGS}> # ) if(MSVC) - set_property(TARGET hl_f90_${file}-shared APPEND PROPERTY LINK_FLAGS "-SUBSYSTEM:CONSOLE;${WIN_LINK_FLAGS}") + set_property(TARGET hl_f90_${file}-shared PROPERTY LINK_FLAGS "/SUBSYSTEM:CONSOLE;${WIN_LINK_FLAGS}") endif() set_target_properties (hl_f90_${file}-shared PROPERTIES LINKER_LANGUAGE Fortran -- cgit v0.12