projects
/
mussa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update mussa to build on ubuntu 10.04 with qt 4.6.2 +boost 1.40.0.1
[mussa.git]
/
qui
/
CMakeLists.txt
diff --git
a/qui/CMakeLists.txt
b/qui/CMakeLists.txt
index 914678be963cf9e8467c0a2b053e39b1f59403bb..1ae54fd01c741dfb00c164502f82c36b476cf89e 100644
(file)
--- 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)
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 )
FIND_PACKAGE(PythonLibs)
INCLUDE( Platform )
@@
-26,7
+28,7
@@
SET(MOC_HEADERS
motif_editor/MotifModel.hpp
motif_editor/MotifEditor.hpp
motif_editor/MotifEditorDelegate.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
mussa_setup_dialog/MussaSetupDialog.hpp
mussa_setup_dialog/MussaSetupWidget.hpp
mussa_setup_dialog/SequenceSetupFrame.hpp
@@
-86,7
+88,7
@@
GET_MUSSA_LINK_FLAGS(QUI_LDFLAGS)
INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_PATH}
${QT_INCLUDES}
INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_PATH}
${QT_INCLUDES}
- ${B
OOST
_INCLUDE_DIR} )
+ ${B
oost
_INCLUDE_DIR} )
ADD_LIBRARY(mussa_qui STATIC ${SOURCES})
ADD_LIBRARY(mussa_qui STATIC ${SOURCES})
@@
-108,3
+110,6
@@
SET_TARGET_PROPERTIES(
ADD_SUBDIRECTORY( test )
ADD_SUBDIRECTORY( test )
+ADD_SUBDIRECTORY( motif_editor/test )
+ADD_SUBDIRECTORY( seqbrowser/test )
+ADD_SUBDIRECTORY( subanalysis/test )