X-Git-Url: http://woldlab.caltech.edu/gitweb/?p=mussa.git;a=blobdiff_plain;f=py%2FCMakeLists.txt;h=dbfdb2d3c4e3ae0974b6063dcbe6e443c532425e;hp=c5a30d609aa92b6f1cfb8e8c18452f17ecbc4c80;hb=HEAD;hpb=80ca9b3ccb2a64f22ab3039b9ee2ecbae2c43e10

diff --git a/py/CMakeLists.txt b/py/CMakeLists.txt
index c5a30d6..dbfdb2d 100644
--- a/py/CMakeLists.txt
+++ b/py/CMakeLists.txt
@@ -1,4 +1,6 @@
-FIND_PACKAGE(Boost)
+set(Boost_USE_STATIC_LIBS   OFF)
+set(Boost_USE_MULTITHREADED ON)
+FIND_PACKAGE(Boost 1.34.1 COMPONENTS python filesystem serialization)
 FIND_PACKAGE(OpenGL)
 FIND_PACKAGE(PythonLibs)
 FIND_PACKAGE(PythonInterp)
@@ -7,14 +9,16 @@ FIND_PACKAGE(Qt4)
 INCLUDE( ${QT_USE_FILE} )
 
 
-IF(BOOST_PYTHON_LIBRARY)
+IF(Boost_PYTHON_LIBRARY)
   INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_PATH} ${QT_INCLUDES})
   SET(SOURCES 
         stl_container_adapter.cpp
         alphabet.cpp
         annot.cpp
         annotation_colors.cpp
+	annotations.cpp
         conserved_path.cpp 
+        drawable.cpp
         flp.cpp
         glsequence.cpp
         module.cpp 
@@ -33,12 +37,14 @@ IF(BOOST_PYTHON_LIBRARY)
   )                        
   SET(MUSSA_LIBRARIES
         mussa_core
-        ${BOOST_PYTHON_LIBRARY}
-        ${BOOST_FILESYSTEM_LIBRARY}
-        ${BOOST_SERIALIZATION_LIBRARY}
+        ${Boost_PYTHON_LIBRARY}
+        ${Boost_SYSTEM_LIBRARY}
+        ${Boost_FILESYSTEM_LIBRARY}
+        ${Boost_SERIALIZATION_LIBRARY}
         ${OPENGL_gl_LIBRARY}
-        optimized ${QT_QTCORE_LIBRARY_RELEASE}
-        debug ${QT_QTCORE_LIBRARY_DEBUG}
+        ${QT_QTCORE_LIBRARY}
+        #optimized ${QT_QTCORE_LIBRARY_RELEASE}
+        #debug ${QT_QTCORE_LIBRARY_DEBUG}
      )        
   GET_MUSSA_COMPILE_FLAGS(PY_CFLAGS)
   GET_MUSSA_LINK_FLAGS(PY_LDFLAGS)
@@ -75,10 +81,8 @@ IF(BOOST_PYTHON_LIBRARY)
                         mussa_qui
                         ${MUSSA_LIBRARIES}
                         ${PYTHON_LIBRARIES}
-                        optimized ${QT_QTGUI_LIBRARY}
-                        debug ${QT_QTGUI_LIBRARY_DEBUG}
-                        optimized ${QT_QTOPENGL_LIBRARY}
-                        debug ${QT_QTOPENGL_LIBRARY_DEBUG}
+                        ${QT_QTGUI_LIBRARY}
+                        ${QT_QTOPENGL_LIBRARY}
                        )
   
   SET_SOURCE_FILES_PROPERTIES(
@@ -96,12 +100,15 @@ IF(BOOST_PYTHON_LIBRARY)
 
   IF(PYTHON_EXECUTABLE)
     SET(PYTEST_DIR ${CMAKE_SOURCE_DIR}/py/test/)
+    ADD_TEST(TestAnnotations 
+                     ${PYTHON_EXECUTABLE} ${PYTEST_DIR}/TestAnnotations.py)
     ADD_TEST(TestSeqSpan ${PYTHON_EXECUTABLE} ${PYTEST_DIR}/TestSeqSpan.py)
     ADD_TEST(TestSequence ${PYTHON_EXECUTABLE} ${PYTEST_DIR}/TestSequence.py)
     ADD_TEST(TestFlp ${PYTHON_EXECUTABLE} ${PYTEST_DIR}/TestFlp.py)
     ADD_TEST(TestMussa ${PYTHON_EXECUTABLE} ${PYTEST_DIR}/TestMussa.py)
   ENDIF(PYTHON_EXECUTABLE)
-ELSE(BOOST_PYTHON_LIBRARY)
-ENDIF(BOOST_PYTHON_LIBRARY)
+ELSE(Boost_PYTHON_LIBRARY)
+  MESSAGE(STATUS "Not building mussa python extension, Boost python not found")
+ENDIF(Boost_PYTHON_LIBRARY)
 
 ADD_SUBDIRECTORY(test)