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 28d7b6870aa4647643361e86c433423916d748c4..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,14
+21,18
@@
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)
+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)
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}
INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_PATH}
${QT_INCLUDES}
- ${B
OOST
_INCLUDE_DIR} )
+ ${B
oost
_INCLUDE_DIR} )
# all of our source files al relative to the root of our project
# all of our source files al relative to the root of our project
@@
-57,9
+61,10
@@
TARGET_LINK_LIBRARIES(mussagl
# Including QT_LIBS twice is for dealing with linking dependancies
# related to Qt Assistant Client on windows
${QT_LIBRARIES}
# 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_SYSTEM_LIBRARY}
+ ${Boost_PROGRAM_OPTIONS_LIBRARY}
${OPENGL_gl_LIBRARY}
)
${OPENGL_gl_LIBRARY}
)
@@
-69,12
+74,11
@@
IF(USE_PYTHON)
mussa_py
${QT_LIBRARIES}
#mussaqui_py
mussa_py
${QT_LIBRARIES}
#mussaqui_py
- ${B
OOST
_PYTHON_LIBRARY}
+ ${B
oost
_PYTHON_LIBRARY}
${PYTHON_LIBRARIES}
${PYTHON_LINK_LIBRARIES})
ENDIF(USE_PYTHON)
${PYTHON_LIBRARIES}
${PYTHON_LINK_LIBRARIES})
ENDIF(USE_PYTHON)
-
GET_MUSSA_COMPILE_FLAGS(MAIN_CFLAGS)
GET_MUSSA_LINK_FLAGS(MAIN_LDFLAGS)
GET_MUSSA_COMPILE_FLAGS(MAIN_CFLAGS)
GET_MUSSA_LINK_FLAGS(MAIN_LDFLAGS)