cmake build system: fix compilation of supernova testsuite

Signed-off-by: Tim Blechmann <tim@klingt.org>
supercollider · Apr 11, 2012 · f026427 · f026427
1 parent 54fe971
commit f026427
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -222,7 +222,7 @@ if(CURL)
 endif()
 
 set(Boost_USE_MULTITHREADED      ON)
-find_package( Boost 1.48.0 COMPONENTS thread system filesystem program_options regex )
+find_package( Boost 1.48.0 COMPONENTS thread system filesystem program_options regex test )
 
 if (SC_OX)
 	set(Boost_FOUND OFF) # boost 1.48 does not like c++11

diff --git a/testsuite/supernova/CMakeLists.txt b/testsuite/supernova/CMakeLists.txt
@@ -71,7 +71,12 @@ add_library(boost_test STATIC boost_test.cpp)
 foreach(test ${simple_tests})
   string(REPLACE .cpp "" test_name ${test} )
   add_executable(${test_name} ${test})
-  target_link_libraries(${test_name} boost_thread boost_system boost_test)
+
+  if (Boost_FOUND)
+    target_link_libraries(${test_name}  ${Boost_THREAD_LIBRARY} ${Boost_SYSTEM_LIBRARY} ${Boost_TEST_LIBRARY})
+  else()
+    target_link_libraries(${test_name} boost_thread boost_system boost_test)
+  endif()
   target_link_libraries(${test_name} oscpack tlsf)
   target_link_libraries(${test_name} ${PTHREADS_LIBRARY})
   target_link_libraries(${test_name} ${SNDFILE_LIBRARIES})