X-Git-Url: http://woldlab.caltech.edu/gitweb/?a=blobdiff_plain;f=CMakeLists.txt;h=1a9bbb34b22d6377b5338c8c76614cf876d76fd7;hb=2534e631c7aca3a93823ea3dc868808bba6cd824;hp=a5888b481d79eb1856c4a80f54b7d16c9594f18c;hpb=7c3bf26770d10c90e1b40c60479114f42a84edf0;p=mussa.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a5888b4..1a9bbb3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,19 +21,25 @@ IF(QT_QTASSISTANT_FOUND)
 ENDIF(QT_QTASSISTANT_FOUND)
 INCLUDE( ${QT_USE_FILE} )
 FIND_PACKAGE(OpenGL)
-FIND_PACKAGE(Boost)
+FIND_PACKAGE(Boost 1.34.1 COMPONENTS filesystem serialization program_options python)
 FIND_PACKAGE(PythonLibs)
 
-SET(USE_PYTHON 1)
+SET(USE_PYTHON 0 CACHE BOOL
+    "Build mussa executable linked to python interpreter")
 
 INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_PATH} 
                     ${QT_INCLUDES}
-                    ${BOOST_INCLUDE_DIR} )
+                    ${Boost_INCLUDE_DIR} )
 
 
 # all of our source files al relative to the root of our project
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR})
 ADD_SUBDIRECTORY( doc )
+IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/paircomp) 
+  MESSAGE(STATUS "Found paircomp")
+  SET(USE_PAIRCOMP 1)
+  ADD_SUBDIRECTORY( paircomp )
+ENDIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/paircomp)
 ADD_SUBDIRECTORY( alg )
 ADD_SUBDIRECTORY( qui )
 ADD_SUBDIRECTORY( py )
@@ -52,9 +58,9 @@ TARGET_LINK_LIBRARIES(mussagl
                         # Including QT_LIBS twice is for dealing with linking dependancies
                         # related to Qt Assistant Client on windows
                         ${QT_LIBRARIES}  
-                        ${BOOST_FILESYSTEM_LIBRARY}
-                        ${BOOST_SERIALIZATION_LIBRARY}
-                        ${BOOST_PROGRAM_OPTIONS_LIBRARY}
+                        ${Boost_FILESYSTEM_LIBRARY}
+                        ${Boost_SERIALIZATION_LIBRARY}
+                        ${Boost_PROGRAM_OPTIONS_LIBRARY}
                         ${OPENGL_gl_LIBRARY}
                       )
 
@@ -63,13 +69,12 @@ IF(USE_PYTHON)
   TARGET_LINK_LIBRARIES(mussagl
         mussa_py
         ${QT_LIBRARIES}
-        mussaqui_py
-        ${BOOST_PYTHON_LIBRARY}
+#mussaqui_py
+        ${Boost_PYTHON_LIBRARY}
         ${PYTHON_LIBRARIES}
         ${PYTHON_LINK_LIBRARIES})
 ENDIF(USE_PYTHON)
 
-
 GET_MUSSA_COMPILE_FLAGS(MAIN_CFLAGS)
 GET_MUSSA_LINK_FLAGS(MAIN_LDFLAGS)