projects
/
mussa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Switch to a new FindBoost
[mussa.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index 51249ceaf70bbbce1523091eb0e44031eac594e3..40c557263285030f77fcd153ba5f6c758f547c92 100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-21,19
+21,24
@@
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)
+FIND_PACKAGE(Boost
1.34.1 COMPONENTS filesystem serialization program_options python
)
FIND_PACKAGE(PythonLibs)
SET(USE_PYTHON 1)
INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_PATH}
${QT_INCLUDES}
FIND_PACKAGE(PythonLibs)
SET(USE_PYTHON 1)
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
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR})
ADD_SUBDIRECTORY( doc )
# 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 )
ADD_SUBDIRECTORY( alg )
ADD_SUBDIRECTORY( qui )
ADD_SUBDIRECTORY( py )
@@
-52,9
+57,9
@@
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}
- ${B
OOST
_FILESYSTEM_LIBRARY}
- ${B
OOST
_SERIALIZATION_LIBRARY}
- ${B
OOST
_PROGRAM_OPTIONS_LIBRARY}
+ ${B
oost
_FILESYSTEM_LIBRARY}
+ ${B
oost
_SERIALIZATION_LIBRARY}
+ ${B
oost
_PROGRAM_OPTIONS_LIBRARY}
${OPENGL_gl_LIBRARY}
)
${OPENGL_gl_LIBRARY}
)
@@
-63,13
+68,12
@@
IF(USE_PYTHON)
TARGET_LINK_LIBRARIES(mussagl
mussa_py
${QT_LIBRARIES}
TARGET_LINK_LIBRARIES(mussagl
mussa_py
${QT_LIBRARIES}
-
mussa_
qui_py
- ${B
OOST
_PYTHON_LIBRARY}
+
#mussa
qui_py
+ ${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)