X-Git-Url: http://woldlab.caltech.edu/gitweb/?a=blobdiff_plain;f=py%2FCMakeLists.txt;h=c47574269e1146e36ec338ca83fb522e9b345526;hb=c417e847eccd0af3bf9dfed0bc252115bbbf3d83;hp=00a18b5969a069f2699c6c70874cc8cfcea81eaf;hpb=4f83d2a3cb065e7219e83bd6d45ee11d0318facf;p=mussa.git

diff --git a/py/CMakeLists.txt b/py/CMakeLists.txt
index 00a18b5..c475742 100644
--- a/py/CMakeLists.txt
+++ b/py/CMakeLists.txt
@@ -2,7 +2,7 @@ FIND_PACKAGE(Boost)
 FIND_PACKAGE(OpenGL)
 FIND_PACKAGE(PythonLibs)
 FIND_PACKAGE(PythonInterp)
-SET(QT_DONT_USE_QTGUI 1)
+# SET(QT_DONT_USE_QTGUI 1)
 FIND_PACKAGE(Qt4)
 INCLUDE( ${QT_USE_FILE} )
 
@@ -10,56 +10,96 @@ INCLUDE( ${QT_USE_FILE} )
 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 
         flp.cpp
         glsequence.cpp
         module.cpp 
         mussa.cpp
-        # MussaWindow.cpp
         nway_paths.cpp
+        seq_span.cpp
         sequence.cpp
         )
-  
-  ADD_LIBRARY(mussa MODULE ${SOURCES})
-  ADD_LIBRARY(mussa_py STATIC ${SOURCES})
-  # Any suggestions for a more elegant solution to this? -diane
-  IF(WIN32)
-    ADD_CUSTOM_TARGET(mussa.dll ALL
-                      COMMAND copy libmussa.dll mussa.dll
-                      DEPENDS mussa)
-  ELSE(WIN32)
-    # Not win32, aka linux and mac
-    ADD_CUSTOM_TARGET(mussa.so ALL
-                      COMMAND cp libmussa.so mussa.so
-                      DEPENDS mussa)
-  ENDIF(WIN32)
-  TARGET_LINK_LIBRARIES(mussa 
-                          mussa_core
-                          ${BOOST_PYTHON_LIBRARY}
-                          ${BOOST_FILESYSTEM_LIBRARY}
-                          ${BOOST_SERIALIZATION_LIBRARY}
-                          ${OPENGL_gl_LIBRARY}
-                          ${PYTHON_LIBRARIES}
-                          optimized ${QT_QTCORE_LIBRARY} 
-                          debug ${QT_QTCORE_LIBRARY_DEBUG} 
-                        )
+  SET(QUI_SOURCES
+    module_qui.cpp
+    qt.cpp
+    sequence.cpp
+    glsequence.cpp
+    annotation_colors.cpp
+    sequencebrowserwidget.cpp
+  )                        
+  SET(MUSSA_LIBRARIES
+        mussa_core
+        ${BOOST_PYTHON_LIBRARY}
+        ${BOOST_FILESYSTEM_LIBRARY}
+        ${BOOST_SERIALIZATION_LIBRARY}
+        ${OPENGL_gl_LIBRARY}
+        optimized ${QT_QTCORE_LIBRARY_RELEASE}
+        debug ${QT_QTCORE_LIBRARY_DEBUG}
+     )        
   GET_MUSSA_COMPILE_FLAGS(PY_CFLAGS)
   GET_MUSSA_LINK_FLAGS(PY_LDFLAGS)
+
+	# configure static core python library  
+  ADD_LIBRARY(mussa_py STATIC ${SOURCES})
+  SET_TARGET_PROPERTIES(mussa_py PROPERTIES 
+                        COMPILE_FLAGS "${PY_CFLAGS}"
+                        LINK_FLAGS "${PY_LDFLAGS}")
+
+  # configure core (shared) python module 
+  ADD_LIBRARY(mussa MODULE ${SOURCES})
+  SET_TARGET_PROPERTIES(mussa PROPERTIES 
+                        PREFIX ""
+                        COMPILE_FLAGS "${PY_CFLAGS}"
+                        LINK_FLAGS "${PY_LDFLAGS}")
+  TARGET_LINK_LIBRARIES(mussa
+                        ${MUSSA_LIBRARIES}
+                        ${PYTHON_LIBRARIES}
+                        )
+  # configure static gui python library
+  #ADD_LIBRARY(mussaqui_py STATIC ${QUI_SOURCES})
+  #  SET_TARGET_PROPERTIES(mussa_py PROPERTIES 
+  #                        COMPILE_FLAGS "${PY_CFLAGS}"
+  #                        LINK_FLAGS "${PY_LDFLAGS}")
+                        
+  # configure gui (shared) python library
+  ADD_LIBRARY(mussaqui MODULE ${QUI_SOURCES})
+  SET_TARGET_PROPERTIES(mussaqui PROPERTIES 
+                       PREFIX ""
+                       COMPILE_FLAGS "${PY_CFLAGS}"
+                       LINK_FLAGS "${PY_LDFLAGS}")
+  TARGET_LINK_LIBRARIES(mussaqui
+                        mussa_qui
+                        ${MUSSA_LIBRARIES}
+                        ${PYTHON_LIBRARIES}
+                        optimized ${QT_QTGUI_LIBRARY}
+                        debug ${QT_QTGUI_LIBRARY_DEBUG}
+                        optimized ${QT_QTOPENGL_LIBRARY}
+                        debug ${QT_QTOPENGL_LIBRARY_DEBUG}
+                       )
+  
   SET_SOURCE_FILES_PROPERTIES(
     ${SOURCES}
+    ${QUI_SOURCES}
     PROPERTIES
     COMPILE_FLAGS "${PY_CFLAGS}"
   )
   SET_TARGET_PROPERTIES(
-    mussa mussa_py PROPERTIES
+    ${STATIC_PYTHON_TARGETS} ${SHARED_PYTHON_TARGETS}
+    PROPERTIES
     COMPILE_FLAGS "${PY_CFLAGS}"
     LINK_FLAGS "${PY_LDFLAGS}"
   )
 
   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)