X-Git-Url: http://woldlab.caltech.edu/gitweb/?a=blobdiff_plain;f=alg%2FCMakeLists.txt;h=83315dca6333bf4438a4e672f2e7b5d2ca1cb517;hb=HEAD;hp=a04c0e2ace3a2b7924749323baa4726e78084239;hpb=7f1791e0ff395113cbf1f1b6e837102b14c16316;p=mussa.git

diff --git a/alg/CMakeLists.txt b/alg/CMakeLists.txt
index a04c0e2..83315dc 100644
--- a/alg/CMakeLists.txt
+++ b/alg/CMakeLists.txt
@@ -1,7 +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} )
+INCLUDE( Platform )
 
 SET(MOC_HEADERS
             mussa.hpp
@@ -9,34 +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 
+            seq.cpp
+            seq_span.cpp
             sequence.cpp
             sequence_location.cpp )
 
+GET_MUSSA_COMPILE_FLAGS(ALG_CFLAGS)
+GET_MUSSA_LINK_FLAGS(ALG_LDFLAGS)
+SET_SOURCE_FILES_PROPERTIES(
+  ${SOURCES} ${MOC_SOURCES}
+  PROPERTIES
+  COMPILE_FLAGS "${ALG_CFLAGS}"
+)
+
 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})
-
-# these are really only needed for gcc on AMD64
-SET_SOURCE_FILES_PROPERTIES(${SOURCES} ${MOC_SOURCES} 
-                            PROPERTIES COMPILE_FLAGS "-fPIC")
-SET_TARGET_PROPERTIES(mussa_core PROPERTIES COMPILE_FLAGS "-fPIC")
+                    ${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 )