From b35fcfcd12aa00837627b282a6e50f65e420e9ee Mon Sep 17 00:00:00 2001 From: Xiretza Date: Thu, 21 Jan 2021 18:51:10 +0100 Subject: [PATCH] CMake: append to LINK_FLAGS instead of replacing them --- ODIN_II/CMakeLists.txt | 2 +- blifexplorer/CMakeLists.txt | 2 +- libs/EXTERNAL/libblifparse/CMakeLists.txt | 2 +- libs/EXTERNAL/libsdcparse/CMakeLists.txt | 2 +- libs/libarchfpga/CMakeLists.txt | 2 +- utils/fasm/CMakeLists.txt | 4 ++-- utils/route_diag/CMakeLists.txt | 2 +- vpr/CMakeLists.txt | 4 ++-- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ODIN_II/CMakeLists.txt b/ODIN_II/CMakeLists.txt index c27e9e63ee9..bc15b7a4157 100644 --- a/ODIN_II/CMakeLists.txt +++ b/ODIN_II/CMakeLists.txt @@ -189,7 +189,7 @@ endforeach() #Supress IPO link warnings if IPO is enabled get_target_property(ODIN_USES_IPO odin_II INTERPROCEDURAL_OPTIMIZATION) if (ODIN_USES_IPO) - set_target_properties(odin_II PROPERTIES LINK_FLAGS ${IPO_LINK_WARN_SUPRESS_FLAGS}) + set_property(TARGET odin_II APPEND PROPERTY LINK_FLAGS ${IPO_LINK_WARN_SUPRESS_FLAGS}) endif() #add strict odin compiler flags, if set diff --git a/blifexplorer/CMakeLists.txt b/blifexplorer/CMakeLists.txt index 096e7c6c9fc..33284af83a5 100644 --- a/blifexplorer/CMakeLists.txt +++ b/blifexplorer/CMakeLists.txt @@ -59,7 +59,7 @@ else() #Supress IPO link warnings if IPO is enabled get_target_property(TEST_BLIFEXPLORER_USES_IPO blifexplorer INTERPROCEDURAL_OPTIMIZATION) if (TEST_BLIFEXPLORER_USES_IPO) - set_target_properties(blifexplorer PROPERTIES LINK_FLAGS ${IPO_LINK_WARN_SUPRESS_FLAGS}) + set_property(TARGET blifexplorer APPEND PROPERTY LINK_FLAGS ${IPO_LINK_WARN_SUPRESS_FLAGS}) endif() diff --git a/libs/EXTERNAL/libblifparse/CMakeLists.txt b/libs/EXTERNAL/libblifparse/CMakeLists.txt index 358f533f215..3395b58c853 100644 --- a/libs/EXTERNAL/libblifparse/CMakeLists.txt +++ b/libs/EXTERNAL/libblifparse/CMakeLists.txt @@ -57,7 +57,7 @@ if (USES_IPO) CHECK_CXX_COMPILER_FLAG(${flag} CXX_COMPILER_SUPPORTS_${flag}) if(CXX_COMPILER_SUPPORTS_${flag}) #Flag supported, so enable it - set_target_properties(blifparse_test PROPERTIES LINK_FLAGS ${flag}) + set_property(TARGET blifparse_test APPEND PROPERTY LINK_FLAGS ${flag}) endif() endforeach() endif() diff --git a/libs/EXTERNAL/libsdcparse/CMakeLists.txt b/libs/EXTERNAL/libsdcparse/CMakeLists.txt index 627aa1e4a24..585f997bcbb 100644 --- a/libs/EXTERNAL/libsdcparse/CMakeLists.txt +++ b/libs/EXTERNAL/libsdcparse/CMakeLists.txt @@ -61,7 +61,7 @@ if (USES_IPO) CHECK_CXX_COMPILER_FLAG(${flag} CXX_COMPILER_SUPPORTS_${flag}) if(CXX_COMPILER_SUPPORTS_${flag}) #Flag supported, so enable it - set_target_properties(sdcparse_test PROPERTIES LINK_FLAGS ${flag}) + set_property(TARGET sdcparse_test APPEND PROPERTY LINK_FLAGS ${flag}) endif() endforeach() endif() diff --git a/libs/libarchfpga/CMakeLists.txt b/libs/libarchfpga/CMakeLists.txt index 569b92058b5..37a07f0a771 100644 --- a/libs/libarchfpga/CMakeLists.txt +++ b/libs/libarchfpga/CMakeLists.txt @@ -30,7 +30,7 @@ target_link_libraries(read_arch libarchfpga) #Supress IPO link warnings if IPO is enabled get_target_property(READ_ARCH_USES_IPO read_arch INTERPROCEDURAL_OPTIMIZATION) if (READ_ARCH_USES_IPO) - set_target_properties(read_arch PROPERTIES LINK_FLAGS ${IPO_LINK_WARN_SUPRESS_FLAGS}) + set_property(TARGET read_arch APPEND PROPERTY LINK_FLAGS ${IPO_LINK_WARN_SUPRESS_FLAGS}) endif() install(TARGETS libarchfpga read_arch DESTINATION bin) diff --git a/utils/fasm/CMakeLists.txt b/utils/fasm/CMakeLists.txt index 40328390da2..d9eb1338e26 100644 --- a/utils/fasm/CMakeLists.txt +++ b/utils/fasm/CMakeLists.txt @@ -30,7 +30,7 @@ target_link_libraries(genfasm fasm) #Supress IPO link warnings if IPO is enabled get_target_property(GENFASM_USES_IPO genfasm INTERPROCEDURAL_OPTIMIZATION) if (GENFASM_USES_IPO) - set_target_properties(genfasm PROPERTIES LINK_FLAGS ${IPO_LINK_WARN_SUPRESS_FLAGS}) + set_property(TARGET genfasm APPEND PROPERTY LINK_FLAGS ${IPO_LINK_WARN_SUPRESS_FLAGS}) endif() #Specify link-time dependancies @@ -52,7 +52,7 @@ target_link_libraries(test_fasm fasm libcatch) #Supress IPO link warnings if IPO is enabled get_target_property(TEST_FASM_USES_IPO test_fasm INTERPROCEDURAL_OPTIMIZATION) if (TEST_FASM_USES_IPO) - set_target_properties(test_fasm PROPERTIES LINK_FLAGS ${IPO_LINK_WARN_SUPRESS_FLAGS}) + set_property(TARGET test_fasm APPEND PROPERTY LINK_FLAGS ${IPO_LINK_WARN_SUPRESS_FLAGS}) endif() add_test( diff --git a/utils/route_diag/CMakeLists.txt b/utils/route_diag/CMakeLists.txt index 00f48ffc694..728156259a0 100644 --- a/utils/route_diag/CMakeLists.txt +++ b/utils/route_diag/CMakeLists.txt @@ -11,6 +11,6 @@ target_link_libraries(route_diag #Supress IPO link warnings if IPO is enabled get_target_property(TEST_ROUTE_DIAG_USES_IPO route_diag INTERPROCEDURAL_OPTIMIZATION) if (TEST_ROUTE_DIAG_USES_IPO) - set_target_properties(route_diag PROPERTIES LINK_FLAGS ${IPO_LINK_WARN_SUPRESS_FLAGS}) + set_property(TARGET route_diag APPEND PROPERTY LINK_FLAGS ${IPO_LINK_WARN_SUPRESS_FLAGS}) endif() diff --git a/vpr/CMakeLists.txt b/vpr/CMakeLists.txt index d8f46f5e400..ac2ae313730 100644 --- a/vpr/CMakeLists.txt +++ b/vpr/CMakeLists.txt @@ -135,7 +135,7 @@ target_link_libraries(vpr libvpr) #Supress IPO link warnings if IPO is enabled get_target_property(VPR_USES_IPO vpr INTERPROCEDURAL_OPTIMIZATION) if (VPR_USES_IPO) - set_target_properties(vpr PROPERTIES LINK_FLAGS ${IPO_LINK_WARN_SUPRESS_FLAGS}) + set_property(TARGET vpr APPEND PROPERTY LINK_FLAGS ${IPO_LINK_WARN_SUPRESS_FLAGS}) endif() @@ -263,7 +263,7 @@ target_link_libraries(test_vpr #Supress IPO link warnings if IPO is enabled get_target_property(TEST_VPR_USES_IPO vpr INTERPROCEDURAL_OPTIMIZATION) if (TEST_VPR_USES_IPO) - set_target_properties(test_vpr PROPERTIES LINK_FLAGS ${IPO_LINK_WARN_SUPRESS_FLAGS}) + set_property(TARGET test_vpr APPEND PROPERTY LINK_FLAGS ${IPO_LINK_WARN_SUPRESS_FLAGS}) endif() add_test(NAME test_vpr