From: Peter Michael Green <plugwash@raspbian.org>
Date: Thu, 27 Jun 2024 01:42:45 +0000 (+0000)
Subject: link with libatomic in more places.
X-Git-Tag: archive/raspbian/8.0.3+dfsg-1+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e043a818145dec8d3bccf1217398b00fd151b7a4;p=kicad.git

link with libatomic in more places.
---

diff --git a/bitmap2component/CMakeLists.txt b/bitmap2component/CMakeLists.txt
index 4c33940d..c0743e97 100644
--- a/bitmap2component/CMakeLists.txt
+++ b/bitmap2component/CMakeLists.txt
@@ -54,6 +54,7 @@ target_link_libraries( bitmap2component
     common
     ${wxWidgets_LIBRARIES}
     potrace
+    atomic
     )
 
 if( APPLE )
diff --git a/debian/patches/link-with-libatomic.patch b/debian/patches/link-with-libatomic.patch
index 04de5982..d6a3030f 100644
--- a/debian/patches/link-with-libatomic.patch
+++ b/debian/patches/link-with-libatomic.patch
@@ -25,3 +25,75 @@ index b64f2138..8d5dc07c 100644
          )
  
      target_link_libraries( kicad-cli
+diff --git a/bitmap2component/CMakeLists.txt b/bitmap2component/CMakeLists.txt
+index 4c33940d..c0743e97 100644
+--- a/bitmap2component/CMakeLists.txt
++++ b/bitmap2component/CMakeLists.txt
+@@ -54,6 +54,7 @@ target_link_libraries( bitmap2component
+     common
+     ${wxWidgets_LIBRARIES}
+     potrace
++    atomic
+     )
+ 
+ if( APPLE )
+diff --git a/qa/tests/eeschema/CMakeLists.txt b/qa/tests/eeschema/CMakeLists.txt
+index 0a752bd3..d17543d6 100644
+--- a/qa/tests/eeschema/CMakeLists.txt
++++ b/qa/tests/eeschema/CMakeLists.txt
+@@ -106,6 +106,7 @@ PRIVATE
+     ${GDI_PLUS_LIBRARIES}
+     Boost::headers
+     Boost::unit_test_framework
++    atomic
+ )
+ 
+ # Eeschema tests, so pretend to be eeschema (for units, etc)
+diff --git a/qa/tests/gerbview/CMakeLists.txt b/qa/tests/gerbview/CMakeLists.txt
+index 635c8911..2d21624e 100644
+--- a/qa/tests/gerbview/CMakeLists.txt
++++ b/qa/tests/gerbview/CMakeLists.txt
+@@ -71,6 +71,7 @@ target_link_libraries( qa_gerbview
+     Boost::headers
+     Boost::unit_test_framework
+     ${PCBNEW_EXTRA_LIBS}    # -lrt must follow Boost
++    atomic
+ )
+ 
+ kicad_add_boost_test( qa_gerbview qa_gerbview )
+diff --git a/qa/tests/pcbnew/CMakeLists.txt b/qa/tests/pcbnew/CMakeLists.txt
+index 8e854e3e..dec4b64f 100644
+--- a/qa/tests/pcbnew/CMakeLists.txt
++++ b/qa/tests/pcbnew/CMakeLists.txt
+@@ -132,6 +132,7 @@ target_link_libraries( qa_pcbnew
+     Boost::headers
+     Boost::unit_test_framework
+     ${PCBNEW_EXTRA_LIBS}    # -lrt must follow Boost
++    atomic
+ )
+ 
+ if( WIN32 )
+diff --git a/qa/tests/spice/CMakeLists.txt b/qa/tests/spice/CMakeLists.txt
+index 26733ec6..0d78ef56 100644
+--- a/qa/tests/spice/CMakeLists.txt
++++ b/qa/tests/spice/CMakeLists.txt
+@@ -93,6 +93,7 @@ PRIVATE
+     ${GDI_PLUS_LIBRARIES}
+     Boost::headers
+     Boost::unit_test_framework
++    atomic
+ )
+ 
+ if( KICAD_SPICE_QA AND MSVC )
+diff --git a/qa/tools/pcbnew_tools/CMakeLists.txt b/qa/tools/pcbnew_tools/CMakeLists.txt
+index a5c03b06..74311cdc 100644
+--- a/qa/tools/pcbnew_tools/CMakeLists.txt
++++ b/qa/tools/pcbnew_tools/CMakeLists.txt
+@@ -58,6 +58,7 @@ target_link_libraries( qa_pcbnew_tools
+     ${PYTHON_LIBRARIES}
+     Boost::headers
+     ${PCBNEW_EXTRA_LIBS}    # -lrt must follow Boost
++    atomic
+ )
+ 
+ kicad_add_utils_executable( qa_pcbnew_tools )
diff --git a/qa/tests/eeschema/CMakeLists.txt b/qa/tests/eeschema/CMakeLists.txt
index 0a752bd3..d17543d6 100644
--- a/qa/tests/eeschema/CMakeLists.txt
+++ b/qa/tests/eeschema/CMakeLists.txt
@@ -106,6 +106,7 @@ PRIVATE
     ${GDI_PLUS_LIBRARIES}
     Boost::headers
     Boost::unit_test_framework
+    atomic
 )
 
 # Eeschema tests, so pretend to be eeschema (for units, etc)
diff --git a/qa/tests/gerbview/CMakeLists.txt b/qa/tests/gerbview/CMakeLists.txt
index 635c8911..2d21624e 100644
--- a/qa/tests/gerbview/CMakeLists.txt
+++ b/qa/tests/gerbview/CMakeLists.txt
@@ -71,6 +71,7 @@ target_link_libraries( qa_gerbview
     Boost::headers
     Boost::unit_test_framework
     ${PCBNEW_EXTRA_LIBS}    # -lrt must follow Boost
+    atomic
 )
 
 kicad_add_boost_test( qa_gerbview qa_gerbview )
diff --git a/qa/tests/pcbnew/CMakeLists.txt b/qa/tests/pcbnew/CMakeLists.txt
index 8e854e3e..dec4b64f 100644
--- a/qa/tests/pcbnew/CMakeLists.txt
+++ b/qa/tests/pcbnew/CMakeLists.txt
@@ -132,6 +132,7 @@ target_link_libraries( qa_pcbnew
     Boost::headers
     Boost::unit_test_framework
     ${PCBNEW_EXTRA_LIBS}    # -lrt must follow Boost
+    atomic
 )
 
 if( WIN32 )
diff --git a/qa/tests/spice/CMakeLists.txt b/qa/tests/spice/CMakeLists.txt
index 26733ec6..0d78ef56 100644
--- a/qa/tests/spice/CMakeLists.txt
+++ b/qa/tests/spice/CMakeLists.txt
@@ -93,6 +93,7 @@ PRIVATE
     ${GDI_PLUS_LIBRARIES}
     Boost::headers
     Boost::unit_test_framework
+    atomic
 )
 
 if( KICAD_SPICE_QA AND MSVC )
diff --git a/qa/tools/pcbnew_tools/CMakeLists.txt b/qa/tools/pcbnew_tools/CMakeLists.txt
index a5c03b06..74311cdc 100644
--- a/qa/tools/pcbnew_tools/CMakeLists.txt
+++ b/qa/tools/pcbnew_tools/CMakeLists.txt
@@ -58,6 +58,7 @@ target_link_libraries( qa_pcbnew_tools
     ${PYTHON_LIBRARIES}
     Boost::headers
     ${PCBNEW_EXTRA_LIBS}    # -lrt must follow Boost
+    atomic
 )
 
 kicad_add_utils_executable( qa_pcbnew_tools )