Update mussa to build on ubuntu 10.04 with qt 4.6.2 +boost 1.40.0.1

[mussa.git] / alg / test / CMakeLists.txt

diff --git a/alg/test/CMakeLists.txt b/alg/test/CMakeLists.txt
index 39815c2ab80a210ff2b94789343168200d67d3fc..8530993a21dc44decaec05da987a7ca33b05235d 100644 (file)
--- a/alg/test/CMakeLists.txt
+++ b/alg/test/CMakeLists.txt
@@ -1,5 +1,8 @@
 FIND_PACKAGE(OpenGL)
-INCLUDE(FindBoost)
+
+set(Boost_USE_STATIC_LIBS   OFF)
+set(Boost_USE_MULTITHREADED ON)
+FIND_PACKAGE(Boost 1.36.0 REQUIRED filesystem unit_test_framework serialization system)
 FIND_PACKAGE(Qt4)
 INCLUDE( ${QT_USE_FILE} )
 INCLUDE(Platform)
@@ -18,9 +21,10 @@ GET_MUSSA_LINK_FLAGS(ALG_TEST_LDFLAGS)
 SET(ALG_TEST_LIBS
       mussa_core
       ${QT_LIBRARIES}
-      ${BOOST_FILESYSTEM_LIBRARY}
-      ${BOOST_UNIT_TEST_LIBRARY} 
-      ${BOOST_SERIALIZATION_LIBRARY}
+      ${Boost_FILESYSTEM_LIBRARY}
+      ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY} 
+      ${Boost_SERIALIZATION_LIBRARY}
+      ${Boost_SYSTEM_LIBRARY}
       ${OPENGL_gl_LIBRARY}
 )
 
@@ -30,7 +34,7 @@ MACRO(MAKE_ALG_UNITTEST basename)
       COMPILE_FLAGS "-DEXAMPLE_DIR=\\\"${EXAMPLE_DIR}\\\" ${ALG_TEST_CFLAGS}"
   )
   ADD_EXECUTABLE(${basename} ${${basename}_SRC})
-  TARGET_LINK_LIBRARIES(${basename} ${ALG_TEST_LIBS}) # ${${basename}_extra_libs})
+  TARGET_LINK_LIBRARIES(${basename} ${ALG_TEST_LIBS})
   
   SET_TARGET_PROPERTIES(
     ${basename}
@@ -43,13 +47,23 @@ ENDMACRO(MAKE_ALG_UNITTEST)
 
 #add all our main tests
 MAKE_ALG_UNITTEST( test_alphabet )
+MAKE_ALG_UNITTEST( test_annotations )
 MAKE_ALG_UNITTEST( test_annotation_color )
 MAKE_ALG_UNITTEST( test_color )
 MAKE_ALG_UNITTEST( test_conserved_path )
+MAKE_ALG_UNITTEST( test_drawable )
 MAKE_ALG_UNITTEST( test_flp )
 MAKE_ALG_UNITTEST( test_glseqbrowser )
 MAKE_ALG_UNITTEST( test_glsequence )
 MAKE_ALG_UNITTEST( test_mussa )
 MAKE_ALG_UNITTEST( test_nway )
+MAKE_ALG_UNITTEST( test_seq )
 MAKE_ALG_UNITTEST( test_sequence )
+MAKE_ALG_UNITTEST( test_seq_span )
 MAKE_ALG_UNITTEST( test_sequence_location )
+
+IF(USE_PAIRCOMP)
+  INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/paircomp/lib )
+  MAKE_ALG_UNITTEST( test_paircomp )
+  TARGET_LINK_LIBRARIES( test_paircomp paircomplib )
+ENDIF(USE_PAIRCOMP)