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 )
# 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}
)
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)