From: Felipe Sateler <fsateler@debian.org>
Date: Sat, 4 Oct 2014 16:19:47 +0000 (+0100)
Subject: Boost 1.5* includes the lockfree lib, so use the system one
X-Git-Tag: archive/raspbian/1%3.10.4+repack-1+rpi1^2^2^2~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=9dfb290d59294c015ece87de8232b13a461689f8;p=supercollider.git

Boost 1.5* includes the lockfree lib, so use the system one

Lockfree requires the atomic library in some archs, so include it in the supernova target


Gbp-Pq: Name system-lockfree.patch
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bec2400..32c20b5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -235,7 +235,7 @@ endif()
 
 if(SYSTEM_BOOST)
   set(Boost_USE_MULTITHREADED      ON)
-  find_package( Boost 1.50.0 COMPONENTS  thread system filesystem program_options regex test_exec_monitor )
+  find_package( Boost 1.50.0 COMPONENTS  thread system filesystem program_options regex test_exec_monitor atomic)
 endif()
 
 if (Boost_FOUND)
diff --git a/lang/CMakeLists.txt b/lang/CMakeLists.txt
index 142bb76..1aa1f9d 100644
--- a/lang/CMakeLists.txt
+++ b/lang/CMakeLists.txt
@@ -6,7 +6,6 @@ include_directories(${CMAKE_SOURCE_DIR}/include/common
 
                     ${YAMLCPP_INCLUDE_DIR}
 
-                    ${CMAKE_SOURCE_DIR}/external_libraries/boost-lockfree
                     ${CMAKE_SOURCE_DIR}/external_libraries/threadpool
                     ${CMAKE_SOURCE_DIR}/external_libraries/TLSF-2.4.6/src
                     LangSource/Bison)
@@ -217,7 +216,7 @@ if (SC_WII OR APPLE)
 endif()
 
 if (Boost_FOUND)
-	target_link_libraries(libsclang ${Boost_THREAD_LIBRARY} ${Boost_SYSTEM_LIBRARY} ${Boost_REGEX_LIBRARY} ${Boost_FILESYSTEM_LIBRARY})
+    target_link_libraries(libsclang ${Boost_THREAD_LIBRARY} ${Boost_SYSTEM_LIBRARY} ${Boost_REGEX_LIBRARY} ${Boost_FILESYSTEM_LIBRARY} ${Boost_ATOMIC_LIBRARY})
 endif()
 
 if (SCLANG_SERVER)
diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
index 3507c65..dd16c57 100644
--- a/server/CMakeLists.txt
+++ b/server/CMakeLists.txt
@@ -4,7 +4,6 @@ if (NOT APPLE AND NOT WIN32)
 endif()
 
 include_directories(${CMAKE_SOURCE_DIR}/external_libraries
-					${CMAKE_SOURCE_DIR}/external_libraries/boost-lockfree
 					${CMAKE_SOURCE_DIR}/external_libraries/nova-simd
 					${CMAKE_SOURCE_DIR}/external_libraries/nova-tt
 					)
diff --git a/server/scsynth/CMakeLists.txt b/server/scsynth/CMakeLists.txt
index 5a7a488..dfe4266 100644
--- a/server/scsynth/CMakeLists.txt
+++ b/server/scsynth/CMakeLists.txt
@@ -207,7 +207,7 @@ if (APPLE)
 endif()
 
 if(CMAKE_SYSTEM_NAME MATCHES "Linux")
-	target_link_libraries(libscsynth rt)
+    target_link_libraries(libscsynth rt ${Boost_THREAD_LIBRARY})
 endif()
 
 file(GLOB_RECURSE all_headers ../../*hpp)
diff --git a/server/supernova/CMakeLists.txt b/server/supernova/CMakeLists.txt
index 2348ef7..28483ca 100644
--- a/server/supernova/CMakeLists.txt
+++ b/server/supernova/CMakeLists.txt
@@ -160,7 +160,7 @@ endif()
 target_link_libraries(libsupernova oscpack tlsf ${PTHREADS_LIBRARIES})
 
 if (Boost_FOUND)
-    target_link_libraries(libsupernova   ${Boost_SYSTEM_LIBRARY} ${Boost_FILESYSTEM_LIBRARY} ${Boost_PROGRAM_OPTIONS_LIBRARY})
+    target_link_libraries(libsupernova   ${Boost_SYSTEM_LIBRARY} ${Boost_FILESYSTEM_LIBRARY} ${Boost_PROGRAM_OPTIONS_LIBRARY} ${Boost_ATOMIC_LIBRARY})
 else()
     target_link_libraries(libsupernova boost_system boost_filesystem boost_program_options)
 endif()
diff --git a/testsuite/supernova/CMakeLists.txt b/testsuite/supernova/CMakeLists.txt
index 0b362f7..3fe2f38 100644
--- a/testsuite/supernova/CMakeLists.txt
+++ b/testsuite/supernova/CMakeLists.txt
@@ -45,7 +45,6 @@ include_directories(${CMAKE_SOURCE_DIR}/include/common
                     ${CMAKE_SOURCE_DIR}/server/supernova
                     ${CMAKE_SOURCE_DIR}/external_libraries/boost
                     ${CMAKE_SOURCE_DIR}/external_libraries/boost_endian
-                    ${CMAKE_SOURCE_DIR}/external_libraries/boost-lockfree
                     ${CMAKE_SOURCE_DIR}/external_libraries/oscpack
                     ${CMAKE_SOURCE_DIR}/external_libraries/
                     ${CMAKE_SOURCE_DIR}/external_libraries/nova-tt