X-Git-Url: http://woldlab.caltech.edu/gitweb/?p=mussa.git;a=blobdiff_plain;f=py%2FCMakeLists.txt;h=0a7fdc2f6001e2be0fff90e392aeee0fa5b783a3;hp=1a76c26fe7c316d1a502b2b4ebfab12904b806a9;hb=02fc4144044a430f8bee6617c0c9871d4ebe5e4d;hpb=e7b789759fa427e7f2b6440ca18d44a5d0210974

diff --git a/py/CMakeLists.txt b/py/CMakeLists.txt
index 1a76c26..0a7fdc2 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} )
 
@@ -17,13 +17,16 @@ IF(BOOST_PYTHON_LIBRARY)
         glsequence.cpp
         module.cpp 
         mussa.cpp
-        # MussaWindow.cpp
         nway_paths.cpp
         sequence.cpp
         )
   SET(QUI_SOURCES
     module_qui.cpp
-    MussaWindow.cpp
+    qt.cpp
+    sequence.cpp
+    glsequence.cpp
+    annotation_colors.cpp
+    sequencebrowserwidget.cpp
   )                        
   SET(MUSSA_LIBRARIES
         mussa_core
@@ -31,7 +34,7 @@ IF(BOOST_PYTHON_LIBRARY)
         ${BOOST_FILESYSTEM_LIBRARY}
         ${BOOST_SERIALIZATION_LIBRARY}
         ${OPENGL_gl_LIBRARY}
-        optimized ${QT_QTCORE_LIBRARY} 
+        optimized ${QT_QTCORE_LIBRARY_RELEASE}
         debug ${QT_QTCORE_LIBRARY_DEBUG}
      )        
   GET_MUSSA_COMPILE_FLAGS(PY_CFLAGS)
@@ -54,26 +57,26 @@ IF(BOOST_PYTHON_LIBRARY)
                         ${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}")
+  #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}
-  #                     )
+  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}