X-Git-Url: http://woldlab.caltech.edu/gitweb/?a=blobdiff_plain;f=qui%2FCMakeLists.txt;h=1ae54fd01c741dfb00c164502f82c36b476cf89e;hb=HEAD;hp=c32176a607c0ad004b1ba792b46a909dea182fb0;hpb=45b97b8f97ed41a8ba127742f1cc417673f95e11;p=mussa.git

diff --git a/qui/CMakeLists.txt b/qui/CMakeLists.txt
index c32176a..1ae54fd 100644
--- a/qui/CMakeLists.txt
+++ b/qui/CMakeLists.txt
@@ -10,7 +10,9 @@ IF(QT_QTASSISTANT_FOUND)
 ENDIF(QT_QTASSISTANT_FOUND)
 INCLUDE( ${QT_USE_FILE} )
 FIND_PACKAGE(OpenGL)
-FIND_PACKAGE(Boost)
+set(Boost_USE_STATIC_LIBS   OFF)
+set(Boost_USE_MULTITHREADED ON)
+FIND_PACKAGE(Boost 1.34.1)
 FIND_PACKAGE(PythonLibs)
 
 INCLUDE( Platform )
@@ -21,14 +23,12 @@ SET(MOC_HEADERS
       IntAction.hpp           
       MussaAlignedWindow.hpp  
       MussaWindow.hpp
-      SequenceLocationModel.hpp
-      SubanalysisWindow.hpp
       ThresholdWidget.hpp
       ZoomWidget.hpp
       motif_editor/MotifModel.hpp
       motif_editor/MotifEditor.hpp
       motif_editor/MotifEditorDelegate.hpp
-      mussa_setup_dialog/IsFileValidator.hpp
+      # mussa_setup_dialog/IsFileValidator.hpp
       mussa_setup_dialog/MussaSetupDialog.hpp
       mussa_setup_dialog/MussaSetupWidget.hpp
       mussa_setup_dialog/SequenceSetupFrame.hpp
@@ -38,6 +38,12 @@ SET(MOC_HEADERS
       seqbrowser/SequenceBrowserSidebar.hpp
       seqbrowser/SequenceBrowserWidget.hpp
       seqbrowser/SequenceDescription.hpp
+      seqbrowser/seqproperties/SequencePropertiesModel.hpp
+      seqbrowser/seqproperties/PropertiesWindow.hpp
+      subanalysis/SequenceLocationModel.hpp
+      subanalysis/SubanalysisWindow.hpp
+      threading/GuiProxy.hpp
+      threading/InterpreterThread.hpp
     )
 SET(GUI_SOURCES 
       ImageSaveDialog.cpp      
@@ -45,8 +51,6 @@ SET(GUI_SOURCES
       IntAction.cpp            
       MussaAlignedWindow.cpp
       MussaWindow.cpp
-      SequenceLocationModel.cpp
-      SubanalysisWindow.cpp
       ThresholdWidget.cpp
       ZoomWidget.cpp
       motif_editor/MotifEditor.cpp
@@ -64,6 +68,13 @@ SET(GUI_SOURCES
       seqbrowser/SequenceBrowserSidebar.cpp
       seqbrowser/SequenceBrowserWidget.cpp
       seqbrowser/SequenceDescription.cpp
+      seqbrowser/seqproperties/SequencePropertiesModel.cpp
+      seqbrowser/seqproperties/PropertiesWindow.cpp
+      subanalysis/SequenceLocationModel.cpp
+      subanalysis/SubanalysisWindow.cpp
+      threading/GuiProxy.cpp
+      threading/InterpreterThread.cpp
+      threading/ThreadManager.cpp
      )
 SET(PY_SOURCES ../py/python.cpp)
 SET(RCCS ../icons.qrc)
@@ -77,11 +88,14 @@ GET_MUSSA_LINK_FLAGS(QUI_LDFLAGS)
 
 INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_PATH} 
                     ${QT_INCLUDES}
-                    ${BOOST_INCLUDE_DIR} )
+                    ${Boost_INCLUDE_DIR} )
 
 ADD_LIBRARY(mussa_qui STATIC ${SOURCES})
-TARGET_LINK_LIBRARIES(mussa_qui 
-                        mussa_core)
+
+# currently QTASSISTANT is only properly installed under windows
+IF(QT_QTASSISTANT_FOUND AND WIN32)
+  SET(QUI_CFLAGS "${QUI_CFLAGS} -DQT_QTASSISTANT_FOUND")
+ENDIF(QT_QTASSISTANT_FOUND AND WIN32)
 
 SET_SOURCE_FILES_PROPERTIES(
   ${SOURCES}
@@ -95,4 +109,7 @@ SET_TARGET_PROPERTIES(
 )
 
 
-#ADD_SUBDIRECTORY( test )
+ADD_SUBDIRECTORY( test )
+ADD_SUBDIRECTORY( motif_editor/test )
+ADD_SUBDIRECTORY( seqbrowser/test )
+ADD_SUBDIRECTORY( subanalysis/test )