diff options
| author | Xiretza | 2021-05-30 01:46:16 +0200 |
|---|---|---|
| committer | Xiretza | 2021-05-30 01:46:16 +0200 |
| commit | 6bf02512e2354b97c938d6756029ea5a9e1c7df9 (patch) | |
| tree | eed03439d677e3cc8ab890302db4fb469735cf97 | |
| parent | 815083f05e594e19e5b5e972aa7c0b607d92cbce (diff) | |
| download | aur-6bf02512e2354b97c938d6756029ea5a9e1c7df9.tar.gz | |
Update patches
| -rw-r--r-- | .SRCINFO | 8 | ||||
| -rw-r--r-- | 0001-aligned_allocator-add-operator.patch | 58 | ||||
| -rw-r--r-- | PKGBUILD | 9 | ||||
| -rw-r--r-- | build.patch | 338 |
4 files changed, 67 insertions, 346 deletions
@@ -1,6 +1,6 @@ pkgbase = vtr-git pkgdesc = Open Source CAD Flow for FPGA Research - pkgver = 8.0.0.r3288.g991b11422 + pkgver = 8.0.0.r3658.g448b8e124 pkgrel = 1 url = https://verilogtorouting.org arch = x86_64 @@ -8,12 +8,12 @@ pkgbase = vtr-git makedepends = git makedepends = cmake depends = gcc-libs - provides = vtr=8.0.0.r3288.g991b11422 + provides = vtr=8.0.0.r3658.g448b8e124 conflicts = vtr source = git+https://github.com/verilog-to-routing/vtr-verilog-to-routing - source = build.patch + source = 0001-aligned_allocator-add-operator.patch sha256sums = SKIP - sha256sums = 558088f88221325e331062e7351d2b9e26a50169f74ece3ecc3e468180ff05b1 + sha256sums = 6d360513c8b10738c77dfe8a91421ba47f5fcdfba9d083ef42caf0802215fdb9 pkgname = vtr-git diff --git a/0001-aligned_allocator-add-operator.patch b/0001-aligned_allocator-add-operator.patch new file mode 100644 index 000000000000..8f318c4d630f --- /dev/null +++ b/0001-aligned_allocator-add-operator.patch @@ -0,0 +1,58 @@ +From fc94422636b9f6e361dc49b0435215b40b435355 Mon Sep 17 00:00:00 2001 +From: Xiretza <xiretza@xiretza.xyz> +Date: Sat, 29 May 2021 23:11:25 +0200 +Subject: [PATCH] aligned_allocator: add operator== +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This fixes building with GCC11, which previously errored: + +In file included from /usr/include/c++/11.1.0/bits/stl_algobase.h:59, + from /usr/include/c++/11.1.0/vector:60, + from /builddir/vtr-verilog-to-routing/libs/libvtrutil/src/vtr_linear_map.h:3, + from /builddir/vtr-verilog-to-routing/vpr/src/timing/PostClusterDelayCalculator.h:3, + from /builddir/vtr-verilog-to-routing/vpr/src/timing/AnalysisDelayCalculator.h:4, + from /builddir/vtr-verilog-to-routing/vpr/src/analysis/timing_reports.h:5, + from /builddir/vtr-verilog-to-routing/vpr/src/analysis/timing_reports.cpp:1: +/usr/include/c++/11.1.0/bits/stl_vector.h: In instantiation of ‘void std::vector<_Tp, _Alloc>::swap(std::vector<_Tp, _Alloc>&) [with _Tp = t_rr_node_data; _Alloc = vtr::aligned_allocator<t_rr_node_data>]’: +/usr/include/c++/11.1.0/bits/allocator.h:308:28: required from ‘static bool std::__shrink_to_fit_aux<_Tp, true>::_S_do_it(_Tp&) [with _Tp = std::vector<t_rr_node_data, vtr::aligned_allocator<t_rr_node_data> >]’ +/usr/include/c++/11.1.0/bits/vector.tcc:693:56: required from ‘bool std::vector<_Tp, _Alloc>::_M_shrink_to_fit() [with _Tp = t_rr_node_data; _Alloc = vtr::aligned_allocator<t_rr_node_data>]’ +/usr/include/c++/11.1.0/bits/stl_vector.h:990:9: required from ‘void std::vector<_Tp, _Alloc>::shrink_to_fit() [with _Tp = t_rr_node_data; _Alloc = vtr::aligned_allocator<t_rr_node_data>]’ +/builddir/vtr-verilog-to-routing/vpr/src/route/rr_graph_storage.h:442:36: required from here +/usr/include/c++/11.1.0/bits/stl_vector.h:1483:9: error: no match for ‘operator==’ (operand types are ‘std::_Vector_base<t_rr_node_data, vtr::aligned_allocator<t_rr_node_data> >::_Tp_alloc_type’ {aka ‘std::allocator_traits<vtr::aligned_allocator<t_rr_node_data> >::rebind_alloc<t_rr_node_data>’} and ‘std::_Vector_base<t_rr_node_data, vtr::aligned_allocator<t_rr_node_data> >::_Tp_alloc_type’ {aka ‘std::allocator_traits<vtr::aligned_allocator<t_rr_node_data> >::rebind_alloc<t_rr_node_data>’}) + 1483 | __glibcxx_assert(_Alloc_traits::propagate_on_container_swap::value + | ^~~~~~~~~~~~~~~~ + +This is caused by gcc commit 10f51543b, which adds compile-time checking +to __glibcxx_assert regardless of the _GLIBCXX_ASSERTIONS preprocessor +definition. + +An assert in std::vector::swap that compares the two vectors' allocators +was previously completely removed by the preprocessor, but now expands +to a static assert. Since no equality operator is defined for +aligned_allocator, any instantiation of a vector with this allocator +fails to compile. +--- + libs/libvtrutil/src/vtr_memory.h | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/libs/libvtrutil/src/vtr_memory.h b/libs/libvtrutil/src/vtr_memory.h +index 316e7b5d9..6ef9f91b4 100644 +--- a/libs/libvtrutil/src/vtr_memory.h ++++ b/libs/libvtrutil/src/vtr_memory.h +@@ -136,6 +136,11 @@ struct aligned_allocator { + } + }; + ++template<typename T> ++bool operator==(const aligned_allocator<T>&, const aligned_allocator<T>&) { ++ return true; ++} ++ + } // namespace vtr + + #endif +-- +2.31.1 + @@ -3,7 +3,7 @@ _pkgname=vtr-verilog-to-routing pkgname=vtr-git -pkgver=8.0.0.r3288.g991b11422 +pkgver=8.0.0.r3658.g448b8e124 pkgrel=1 pkgdesc='Open Source CAD Flow for FPGA Research' arch=(x86_64) @@ -14,9 +14,10 @@ depends=('gcc-libs') provides=("${pkgname%%-git}=$pkgver") conflicts=("${pkgname%%-git}") source=('git+https://github.com/verilog-to-routing/vtr-verilog-to-routing' - 'build.patch') + '0001-aligned_allocator-add-operator.patch' +) sha256sums=('SKIP' - '558088f88221325e331062e7351d2b9e26a50169f74ece3ecc3e468180ff05b1') + '6d360513c8b10738c77dfe8a91421ba47f5fcdfba9d083ef42caf0802215fdb9') pkgver() { cd "$_pkgname" @@ -27,7 +28,7 @@ pkgver() { prepare() { cd "$_pkgname" - patch -p1 < "$srcdir/build.patch" + patch -p1 < "$srcdir/0001-aligned_allocator-add-operator.patch" } build() { diff --git a/build.patch b/build.patch deleted file mode 100644 index d19d603f2806..000000000000 --- a/build.patch +++ /dev/null @@ -1,338 +0,0 @@ -commit b69eec948d9ec94b34570fb6d0d91c6deb9c4093 -Author: Xiretza <xiretza@xiretza.xyz> -Date: Thu Jan 21 18:47:09 2021 +0100 - - Remove hardcoded installation DESTINATIONs - -diff --git a/ODIN_II/CMakeLists.txt b/ODIN_II/CMakeLists.txt -index c27e9e63e..9df1726ae 100644 ---- a/ODIN_II/CMakeLists.txt -+++ b/ODIN_II/CMakeLists.txt -@@ -209,4 +209,4 @@ if(VTR_ENABLE_STRICT_COMPILE) - endforeach() - endif() - --install(TARGETS odin_II libodin_ii DESTINATION bin) -+install(TARGETS odin_II libodin_ii) -diff --git a/ace2/CMakeLists.txt b/ace2/CMakeLists.txt -index 0fed867b3..67f9c6311 100644 ---- a/ace2/CMakeLists.txt -+++ b/ace2/CMakeLists.txt -@@ -32,4 +32,4 @@ foreach(flag ${ACE_SUPPRESS_FLAGS}) - endif() - endforeach() - --install(TARGETS ace DESTINATION bin) -+install(TARGETS ace) -diff --git a/blifexplorer/CMakeLists.txt b/blifexplorer/CMakeLists.txt -index 096e7c6c9..4b67ca475 100644 ---- a/blifexplorer/CMakeLists.txt -+++ b/blifexplorer/CMakeLists.txt -@@ -63,6 +63,6 @@ else() - endif() - - -- install(TARGETS blifexplorer DESTINATION bin) -+ install(TARGETS blifexplorer) - - endif() -diff --git a/libs/EXTERNAL/libblifparse/CMakeLists.txt b/libs/EXTERNAL/libblifparse/CMakeLists.txt -index 358f533f2..963a8986e 100644 ---- a/libs/EXTERNAL/libblifparse/CMakeLists.txt -+++ b/libs/EXTERNAL/libblifparse/CMakeLists.txt -@@ -69,4 +69,4 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}) - COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/test/test_parser.sh ${CMAKE_CURRENT_SOURCE_DIR}/test/*/*.blif ${CMAKE_CURRENT_SOURCE_DIR}/test/*/*.eblif) - endif() - --install(TARGETS libblifparse blifparse_test DESTINATION bin) -+install(TARGETS libblifparse blifparse_test) -diff --git a/libs/EXTERNAL/libpugixml/CMakeLists.txt b/libs/EXTERNAL/libpugixml/CMakeLists.txt -index bc4026124..c52dcd767 100644 ---- a/libs/EXTERNAL/libpugixml/CMakeLists.txt -+++ b/libs/EXTERNAL/libpugixml/CMakeLists.txt -@@ -25,4 +25,4 @@ if(NOT VTR_ENABLE_SANITIZE) - target_compile_definitions(libpugixml PRIVATE PUGIXML_COMPACT) - endif() - --install(TARGETS libpugixml DESTINATION bin) -+install(TARGETS libpugixml) -diff --git a/libs/EXTERNAL/libsdcparse/CMakeLists.txt b/libs/EXTERNAL/libsdcparse/CMakeLists.txt -index 627aa1e4a..b83500872 100644 ---- a/libs/EXTERNAL/libsdcparse/CMakeLists.txt -+++ b/libs/EXTERNAL/libsdcparse/CMakeLists.txt -@@ -66,4 +66,4 @@ if (USES_IPO) - endforeach() - endif() - --install(TARGETS libsdcparse sdcparse_test DESTINATION bin) -+install(TARGETS libsdcparse sdcparse_test) -diff --git a/libs/libarchfpga/CMakeLists.txt b/libs/libarchfpga/CMakeLists.txt -index 569b92058..4039c99a4 100644 ---- a/libs/libarchfpga/CMakeLists.txt -+++ b/libs/libarchfpga/CMakeLists.txt -@@ -33,4 +33,4 @@ if (READ_ARCH_USES_IPO) - set_target_properties(read_arch PROPERTIES LINK_FLAGS ${IPO_LINK_WARN_SUPRESS_FLAGS}) - endif() - --install(TARGETS libarchfpga read_arch DESTINATION bin) -+install(TARGETS libarchfpga read_arch) -diff --git a/libs/liblog/CMakeLists.txt b/libs/liblog/CMakeLists.txt -index 6698686e8..bd16821bd 100644 ---- a/libs/liblog/CMakeLists.txt -+++ b/libs/liblog/CMakeLists.txt -@@ -21,4 +21,4 @@ set_target_properties(liblog PROPERTIES PREFIX "") #Avoid extra 'lib' prefix - add_executable(test_log ${EXEC_SOURCES}) - target_link_libraries(test_log liblog) - --install(TARGETS test_log liblog DESTINATION bin) -+install(TARGETS test_log liblog) -diff --git a/libs/libpugiutil/CMakeLists.txt b/libs/libpugiutil/CMakeLists.txt -index edbd4c988..74ae2462a 100644 ---- a/libs/libpugiutil/CMakeLists.txt -+++ b/libs/libpugiutil/CMakeLists.txt -@@ -19,4 +19,4 @@ set_target_properties(libpugiutil PROPERTIES PREFIX "") #Avoid extra 'lib' prefi - target_link_libraries(libpugiutil - libpugixml) - --install(TARGETS libpugiutil DESTINATION bin) -+install(TARGETS libpugiutil) -diff --git a/libs/librtlnumber/CMakeLists.txt b/libs/librtlnumber/CMakeLists.txt -index 33c84b3b9..2cc28623a 100644 ---- a/libs/librtlnumber/CMakeLists.txt -+++ b/libs/librtlnumber/CMakeLists.txt -@@ -30,4 +30,4 @@ add_executable(rtl_number ${EXEC_SOURCES}) - target_link_libraries(rtl_number - librtlnumber) - --install(TARGETS rtl_number librtlnumber DESTINATION bin) -+install(TARGETS rtl_number librtlnumber) -diff --git a/libs/libvtrutil/CMakeLists.txt b/libs/libvtrutil/CMakeLists.txt -index c3007a91a..e24feddb8 100644 ---- a/libs/libvtrutil/CMakeLists.txt -+++ b/libs/libvtrutil/CMakeLists.txt -@@ -104,7 +104,7 @@ add_dependencies(libvtrutil version) - target_link_libraries(libvtrutil - liblog) - --install(TARGETS libvtrutil DESTINATION bin) -+install(TARGETS libvtrutil) - - # - # Unit Tests -diff --git a/utils/fasm/CMakeLists.txt b/utils/fasm/CMakeLists.txt -index 40328390d..2e3f21563 100644 ---- a/utils/fasm/CMakeLists.txt -+++ b/utils/fasm/CMakeLists.txt -@@ -34,7 +34,7 @@ if (GENFASM_USES_IPO) - endif() - - #Specify link-time dependancies --install(TARGETS genfasm DESTINATION bin) -+install(TARGETS genfasm) - - # - # Unit Tests -diff --git a/vpr/CMakeLists.txt b/vpr/CMakeLists.txt -index d8f46f5e4..af2d15f82 100644 ---- a/vpr/CMakeLists.txt -+++ b/vpr/CMakeLists.txt -@@ -248,7 +248,7 @@ if (VPR_USE_SIGNAL_HANDLER) - endif() - endif() - --install(TARGETS vpr libvpr DESTINATION bin) -+install(TARGETS vpr libvpr) - - - # - -commit be883bf11eb15bc57d7067e85322d6cdcfe52ebe -Author: Xiretza <xiretza@xiretza.xyz> -Date: Thu Jan 21 18:50:36 2021 +0100 - - Do not install test binaries - -diff --git a/libs/EXTERNAL/libblifparse/CMakeLists.txt b/libs/EXTERNAL/libblifparse/CMakeLists.txt -index 963a8986e..7064a7354 100644 ---- a/libs/EXTERNAL/libblifparse/CMakeLists.txt -+++ b/libs/EXTERNAL/libblifparse/CMakeLists.txt -@@ -69,4 +69,4 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}) - COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/test/test_parser.sh ${CMAKE_CURRENT_SOURCE_DIR}/test/*/*.blif ${CMAKE_CURRENT_SOURCE_DIR}/test/*/*.eblif) - endif() - --install(TARGETS libblifparse blifparse_test) -+install(TARGETS libblifparse) -diff --git a/libs/EXTERNAL/libsdcparse/CMakeLists.txt b/libs/EXTERNAL/libsdcparse/CMakeLists.txt -index b83500872..2fa5c8b35 100644 ---- a/libs/EXTERNAL/libsdcparse/CMakeLists.txt -+++ b/libs/EXTERNAL/libsdcparse/CMakeLists.txt -@@ -66,4 +66,4 @@ if (USES_IPO) - endforeach() - endif() - --install(TARGETS libsdcparse sdcparse_test) -+install(TARGETS libsdcparse) -diff --git a/libs/liblog/CMakeLists.txt b/libs/liblog/CMakeLists.txt -index bd16821bd..776ff8b4f 100644 ---- a/libs/liblog/CMakeLists.txt -+++ b/libs/liblog/CMakeLists.txt -@@ -21,4 +21,4 @@ set_target_properties(liblog PROPERTIES PREFIX "") #Avoid extra 'lib' prefix - add_executable(test_log ${EXEC_SOURCES}) - target_link_libraries(test_log liblog) - --install(TARGETS test_log liblog) -+install(TARGETS liblog) - -commit d763da17c608fc846bdb8c65866e6c30d0abbc28 -Author: Xiretza <xiretza@xiretza.xyz> -Date: Thu Jan 21 18:51:10 2021 +0100 - - Append to LINK_FLAGS instead of replacing them - -diff --git a/ODIN_II/CMakeLists.txt b/ODIN_II/CMakeLists.txt -index 9df1726ae..bfa1eca1e 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 4b67ca475..359b415ce 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 ${IPO_LINK_WARN_SUPRESS_FLAGS} PROPERTY LINK_FLAGS) - endif() - - -diff --git a/libs/EXTERNAL/libblifparse/CMakeLists.txt b/libs/EXTERNAL/libblifparse/CMakeLists.txt -index 7064a7354..086c449bc 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 2fa5c8b35..b99b59475 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 4039c99a4..60802d9db 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) -diff --git a/utils/fasm/CMakeLists.txt b/utils/fasm/CMakeLists.txt -index 2e3f21563..885fa4c4e 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 00f48ffc6..728156259 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 af2d15f82..f37222c37 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 - -commit b4de8d99676080da8aa4d476da53e5b912955f26 -Author: Xiretza <xiretza@xiretza.xyz> -Date: Thu Jan 21 18:51:31 2021 +0100 - - libvtrcapnproto: install capnp files to DATADIR - -diff --git a/libs/libvtrcapnproto/CMakeLists.txt b/libs/libvtrcapnproto/CMakeLists.txt -index 8067ab14c..f6a4fd168 100644 ---- a/libs/libvtrcapnproto/CMakeLists.txt -+++ b/libs/libvtrcapnproto/CMakeLists.txt -@@ -1,3 +1,5 @@ -+include(GNUInstallDirs) -+ - if(NOT MSCV) - # These flags generate noisy but non-bug warnings when using lib kj, - # supress them. -@@ -28,7 +30,7 @@ capnp_generate_cpp(CAPNP_SRCS CAPNP_HDRS - ${CAPNP_DEFS} - ) - --install(FILES ${CAPNP_DEFS} DESTINATION capnp) -+install(FILES ${CAPNP_DEFS} DESTINATION ${CMAKE_INSTALL_DATADIR}/capnp) - - add_library(libvtrcapnproto STATIC - ${CAPNP_SRCS} |