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 bec2400370abee02b2707df285d573a4df2a01d0..32c20b5d4959ac60f92a95527d2553a7fb7b9c72 100644 (file)
--- 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 142bb768b54cc6098bdaf251cc8e14386f54263d..1aa1f9d051eaff3e53854058ebc2b42fdba17d00 100644 (file)
--- 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 3507c654a73b85405f0791e6b53ff7c4fc33fdd9..dd16c57ffb93364b5a07e38600ff39765e05d111 100644 (file)
--- 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 5a7a48826fb96862c01cd8157181357a97a63412..dfe42663ce4235bcd43d4ff741041a3525f40406 100644 (file)
--- 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 2348ef71f6a8271fa2729cdc904b5850b2819627..28483ca3b069f5946e00be7e64a8beaac39d8d7a 100644 (file)
--- 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 0b362f7fa784d66d67d27834a41a4719bf75bf42..3fe2f38747ccf0621e652e87b46abe4e6d8b3d29 100644 (file)
--- 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