X-Git-Url: http://woldlab.caltech.edu/gitweb/?p=mussa.git;a=blobdiff_plain;f=CMakeLists.txt;h=59fba73805356ac8808ab569f7d3e18e60f224f9;hp=40c557263285030f77fcd153ba5f6c758f547c92;hb=HEAD;hpb=a16470ae609a64a5233f5e2a6004238053bce027

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 40c5572..59fba73 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
 PROJECT(mussa)
 
 ENABLE_TESTING()
-CMAKE_MINIMUM_REQUIRED(VERSION 2.4)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 # try to include our cmake modules
 SET (CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/makelib)
 INCLUDE(Platform)
@@ -21,10 +21,14 @@ IF(QT_QTASSISTANT_FOUND)
 ENDIF(QT_QTASSISTANT_FOUND)
 INCLUDE( ${QT_USE_FILE} )
 FIND_PACKAGE(OpenGL)
-FIND_PACKAGE(Boost 1.34.1 COMPONENTS filesystem serialization program_options python)
+set(Boost_USE_STATIC_LIBS   OFF)
+set(Boost_USE_MULTITHREADED ON)
+FIND_PACKAGE(Boost 1.40 REQUIRED filesystem serialization system program_options )
+FIND_PACKAGE(Boost 1.40 COMPONENTS 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}
@@ -59,6 +63,7 @@ TARGET_LINK_LIBRARIES(mussagl
                         ${QT_LIBRARIES}  
                         ${Boost_FILESYSTEM_LIBRARY}
                         ${Boost_SERIALIZATION_LIBRARY}
+                        ${Boost_SYSTEM_LIBRARY}
                         ${Boost_PROGRAM_OPTIONS_LIBRARY}
                         ${OPENGL_gl_LIBRARY}
                       )