projects
/
mussa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update mussa to build on ubuntu 10.04 with qt 4.6.2 +boost 1.40.0.1
[mussa.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index 1a9bbb34b22d6377b5338c8c76614cf876d76fd7..59fba73805356ac8808ab569f7d3e18e60f224f9 100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-1,7
+1,7
@@
PROJECT(mussa)
ENABLE_TESTING()
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)
# try to include our cmake modules
SET (CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/makelib)
INCLUDE(Platform)
@@
-21,7
+21,10
@@
IF(QT_QTASSISTANT_FOUND)
ENDIF(QT_QTASSISTANT_FOUND)
INCLUDE( ${QT_USE_FILE} )
FIND_PACKAGE(OpenGL)
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 0 CACHE BOOL
FIND_PACKAGE(PythonLibs)
SET(USE_PYTHON 0 CACHE BOOL
@@
-60,6
+63,7
@@
TARGET_LINK_LIBRARIES(mussagl
${QT_LIBRARIES}
${Boost_FILESYSTEM_LIBRARY}
${Boost_SERIALIZATION_LIBRARY}
${QT_LIBRARIES}
${Boost_FILESYSTEM_LIBRARY}
${Boost_SERIALIZATION_LIBRARY}
+ ${Boost_SYSTEM_LIBRARY}
${Boost_PROGRAM_OPTIONS_LIBRARY}
${OPENGL_gl_LIBRARY}
)
${Boost_PROGRAM_OPTIONS_LIBRARY}
${OPENGL_gl_LIBRARY}
)