From 7441f013f50f613b1a9c0e7a9bff697df442a78e Mon Sep 17 00:00:00 2001 From: Gard Spreemann Date: Fri, 15 Jun 2018 13:38:49 +0200 Subject: Refresh patches. The i686 rounding workaround and CGAL 4.12 compatibility patches dropped. --- ...ing-against-libatomic-for-parts-that-use-T.patch | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 debian/patches/0007-Force-linking-against-libatomic-for-parts-that-use-T.patch (limited to 'debian/patches/0007-Force-linking-against-libatomic-for-parts-that-use-T.patch') diff --git a/debian/patches/0007-Force-linking-against-libatomic-for-parts-that-use-T.patch b/debian/patches/0007-Force-linking-against-libatomic-for-parts-that-use-T.patch new file mode 100644 index 00000000..7d69e5ce --- /dev/null +++ b/debian/patches/0007-Force-linking-against-libatomic-for-parts-that-use-T.patch @@ -0,0 +1,21 @@ +From: Gard Spreemann +Date: Fri, 15 Jun 2018 13:25:37 +0200 +Subject: Force linking against libatomic for parts that use TBB. + +--- + cmake/modules/FindTBB.cmake | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/cmake/modules/FindTBB.cmake b/cmake/modules/FindTBB.cmake +index 13f4d92..6baa8d7 100644 +--- a/cmake/modules/FindTBB.cmake ++++ b/cmake/modules/FindTBB.cmake +@@ -375,6 +375,8 @@ if (TBB_INCLUDE_DIR) + endif(NOT TBB_without_pthread) + endif(UNIX AND NOT APPLE) + ++ list(APPEND ALL_TBB_LIBRARIES atomic) ++ + set (TBB_LIBRARIES ${ALL_TBB_LIBRARIES} + CACHE PATH "TBB libraries" FORCE) + -- cgit v1.2.3