X-Git-Url: http://woldlab.caltech.edu/gitweb/?a=blobdiff_plain;f=alg%2FCMakeLists.txt;h=83315dca6333bf4438a4e672f2e7b5d2ca1cb517;hb=97498410e1fc5c39eac0282a6620b8fcb0f02ff3;hp=07c4fea742e47ff9e41017c485697470221e0e4b;hpb=9b3c74c91e20cfa82a3f4f093ae676a10b8e78d0;p=mussa.git

diff --git a/alg/CMakeLists.txt b/alg/CMakeLists.txt
index 07c4fea..83315dc 100644
--- a/alg/CMakeLists.txt
+++ b/alg/CMakeLists.txt
@@ -1,9 +1,13 @@
 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} )
-
-ADD_SUBDIRECTORY( test )
+INCLUDE( Platform )
 
 SET(MOC_HEADERS
             mussa.hpp
@@ -11,28 +15,45 @@ SET(MOC_HEADERS
    )
 QT4_WRAP_CPP(MOC_SOURCES ${MOC_HEADERS})
 
-SET(SOURCES annotation_colors.cpp 
+SET(SOURCES alphabet.cpp
+            annotations.cpp
+            annotation_colors.cpp 
             color.cpp 
             conserved_path.cpp 
             flp.cpp 
             flp_seqcomp.cpp 
             glseqbrowser.cpp 
             glsequence.cpp 
+            io.cpp
             mussa.cpp 
+            motif_parser.cpp 
             nway_entropy.cpp
             nway_other.cpp 
             nway_paths.cpp
             parse_options.cpp 
-            sequence.cpp)
+            seq.cpp
+            seq_span.cpp
+            sequence.cpp
+            sequence_location.cpp )
 
-ADD_LIBRARY( mussa_core STATIC ${SOURCES} ${MOC_SOURCES})
-INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR})
-INCLUDE_DIRECTORIES(${BOOST_INCLUDE_DIR})
-TARGET_LINK_LIBRARIES(mussa_core 
-                        ${OPEN_gl_LIBRARY}
-                        ${QT_LIBRARIES})
+GET_MUSSA_COMPILE_FLAGS(ALG_CFLAGS)
+GET_MUSSA_LINK_FLAGS(ALG_LDFLAGS)
+SET_SOURCE_FILES_PROPERTIES(
+  ${SOURCES} ${MOC_SOURCES}
+  PROPERTIES
+  COMPILE_FLAGS "${ALG_CFLAGS}"
+)
 
-# these are really only needed for gcc on AMD64
-SET_SOURCE_FILES_PROPERTIES(${SOURCES} PROPERTIES COMPILE_FLAGS "-fPIC")
-SET_TARGET_PROPERTIES(mussa_core PROPERTIES COMPILE_FLAGS "-fPIC")
+ADD_LIBRARY( mussa_core STATIC ${SOURCES} ${MOC_SOURCES})
+INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR}
+                    ${Boost_INCLUDE_DIR}
+                    ${QT_INCLUDES}
+                    ${CMAKE_CURRENT_SOURCE_DIR})
 
+SET_TARGET_PROPERTIES(
+  mussa_core PROPERTIES
+    COMPILE_FLAGS "${ALG_CFLAGS}"
+    LINK_FLAGS "${ALG_LDFLAGS}"
+)
+ADD_SUBDIRECTORY( test )
+ADD_SUBDIRECTORY( tsf )