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]
/
alg
/
CMakeLists.txt
diff --git
a/alg/CMakeLists.txt
b/alg/CMakeLists.txt
index 0d6a84cef28b8625aa40a66bd40fd9b898b673bb..83315dca6333bf4438a4e672f2e7b5d2ca1cb517 100644
(file)
--- a/
alg/CMakeLists.txt
+++ b/
alg/CMakeLists.txt
@@
-1,5
+1,10
@@
FIND_PACKAGE(OpenGL )
FIND_PACKAGE(OpenGL )
-FIND_PACKAGE(Boost REQUIRED)
+
+set(Boost_USE_STATIC_LIBS OFF)
+set(Boost_USE_MULTITHREADED ON)
+FIND_PACKAGE(Boost 1.34.1 REQUIRED filesystem unit_test_framework
+ serialization system program_options )
+FIND_PACKAGE(Boost 1.3.4.1 COMPONENTS python )
FIND_PACKAGE(Qt4)
INCLUDE( ${QT_USE_FILE} )
INCLUDE( Platform )
FIND_PACKAGE(Qt4)
INCLUDE( ${QT_USE_FILE} )
INCLUDE( Platform )
@@
-11,6
+16,7
@@
SET(MOC_HEADERS
QT4_WRAP_CPP(MOC_SOURCES ${MOC_HEADERS})
SET(SOURCES alphabet.cpp
QT4_WRAP_CPP(MOC_SOURCES ${MOC_HEADERS})
SET(SOURCES alphabet.cpp
+ annotations.cpp
annotation_colors.cpp
color.cpp
conserved_path.cpp
annotation_colors.cpp
color.cpp
conserved_path.cpp
@@
-18,11
+24,15
@@
SET(SOURCES alphabet.cpp
flp_seqcomp.cpp
glseqbrowser.cpp
glsequence.cpp
flp_seqcomp.cpp
glseqbrowser.cpp
glsequence.cpp
+ io.cpp
mussa.cpp
mussa.cpp
+ motif_parser.cpp
nway_entropy.cpp
nway_other.cpp
nway_paths.cpp
parse_options.cpp
nway_entropy.cpp
nway_other.cpp
nway_paths.cpp
parse_options.cpp
+ seq.cpp
+ seq_span.cpp
sequence.cpp
sequence_location.cpp )
sequence.cpp
sequence_location.cpp )
@@
-36,12
+46,9
@@
SET_SOURCE_FILES_PROPERTIES(
ADD_LIBRARY( mussa_core STATIC ${SOURCES} ${MOC_SOURCES})
INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR}
ADD_LIBRARY( mussa_core STATIC ${SOURCES} ${MOC_SOURCES})
INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR}
- ${BOOST_INCLUDE_DIR}
- ${QT_INCLUDES})
-
-TARGET_LINK_LIBRARIES(mussa_core
- ${OPEN_gl_LIBRARY}
- ${QT_LIBRARIES})
+ ${Boost_INCLUDE_DIR}
+ ${QT_INCLUDES}
+ ${CMAKE_CURRENT_SOURCE_DIR})
SET_TARGET_PROPERTIES(
mussa_core PROPERTIES
SET_TARGET_PROPERTIES(
mussa_core PROPERTIES