X-Git-Url: http://woldlab.caltech.edu/gitweb/?a=blobdiff_plain;f=alg%2FCMakeLists.txt;h=9963d64542b3f4a549e3a1d6a249e6ef5a3a2d11;hb=6d25d4d945af696134bdf788b111f38b197b1a15;hp=c79b59bc8b76cc9d2a4c4db85061c06dfeca75cf;hpb=f0cceadf945765d90a18e9e6369ef70879a3f617;p=mussa.git

diff --git a/alg/CMakeLists.txt b/alg/CMakeLists.txt
index c79b59b..9963d64 100644
--- a/alg/CMakeLists.txt
+++ b/alg/CMakeLists.txt
@@ -1,28 +1,54 @@
-ADD_SUBDIRECTORY( test )
+FIND_PACKAGE(OpenGL )
+FIND_PACKAGE(Boost REQUIRED)
+FIND_PACKAGE(Qt4)
+INCLUDE( ${QT_USE_FILE} )
+INCLUDE( Platform )
+
+SET(MOC_HEADERS
+            mussa.hpp
+            nway_paths.hpp
+   )
+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 )
 
-FIND_PACKAGE(OpenGL )
-FIND_PACKAGE(Boost REQUIRED)
+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} )
-INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR})
-INCLUDE_DIRECTORIES(${BOOST_INCLUDE_DIR})
-TARGET_LINK_LIBRARIES(mussa_core ${OPEN_gl_LIBRARY})
-
-# 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 )