link with libatomic in more places.

diff --git a/bitmap2component/CMakeLists.txt b/bitmap2component/CMakeLists.txt
index 4c33940d4565f5cbfffebd994e1b7cd84a0a5730..c0743e97e1ce821085e7b779879fa519ab90a677 100644 (file)
--- 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 04de5982972a3e7208da51139adff48b7dd202ad..d6a3030f8d2ae1b34b58c3c7c430896fd2fdef70 100644 (file)
--- 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 0a752bd38d8c2fbb19f0538f518d33cfce6f4e73..d17543d631bc9aad9dec7d17a28765bfcecbcc5a 100644 (file)
--- 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 635c89113779a92b43a8505db9ef7d59fde07aa2..2d21624e5fd8440b0a6142cc332e4b7622e2f6a2 100644 (file)
--- 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 8e854e3e34534e5699a1bacaa582b49eb7ca8ee1..dec4b64fcd63ad26b414186d2ee9f52fed634c73 100644 (file)
--- 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 26733ec6fe628335703dfdb09295d76881e4afbb..0d78ef561fb35319d03b56be506d08be4000e839 100644 (file)
--- 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 a5c03b06677c42eab8218722aef59604c68be6bd..74311cdca4f1b565c5a724602ebad91a16896dc1 100644 (file)
--- 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 )