X-Git-Url: http://woldlab.caltech.edu/gitweb/?p=mussa.git;a=blobdiff_plain;f=alg%2Ftest%2FCMakeLists.txt;h=8530993a21dc44decaec05da987a7ca33b05235d;hp=433c63de67dc5d6d03edec820cf61a0ceb055f09;hb=97498410e1fc5c39eac0282a6620b8fcb0f02ff3;hpb=7d4fbcb6060a60a8ea25ca1303fcaaaf8574f24a

diff --git a/alg/test/CMakeLists.txt b/alg/test/CMakeLists.txt
index 433c63d..8530993 100644
--- 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}
 )
 
@@ -43,14 +47,17 @@ 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 )