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]
/
py
/
CMakeLists.txt
diff --git
a/py/CMakeLists.txt
b/py/CMakeLists.txt
index 032a46447fa6a6cf9762a0b30e2de62309af1fa2..cb793e1ec59772cd6240beab159d41ae0cf0239e 100644
(file)
--- a/
py/CMakeLists.txt
+++ b/
py/CMakeLists.txt
@@
-1,4
+1,4
@@
-FIND_PACKAGE(Boost)
+FIND_PACKAGE(Boost
1.34.1 COMPONENTS python filesystem serialization
)
FIND_PACKAGE(OpenGL)
FIND_PACKAGE(PythonLibs)
FIND_PACKAGE(PythonInterp)
FIND_PACKAGE(OpenGL)
FIND_PACKAGE(PythonLibs)
FIND_PACKAGE(PythonInterp)
@@
-7,7
+7,7
@@
FIND_PACKAGE(Qt4)
INCLUDE( ${QT_USE_FILE} )
INCLUDE( ${QT_USE_FILE} )
-IF(B
OOST
_PYTHON_LIBRARY)
+IF(B
oost
_PYTHON_LIBRARY)
INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_PATH} ${QT_INCLUDES})
SET(SOURCES
stl_container_adapter.cpp
INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_PATH} ${QT_INCLUDES})
SET(SOURCES
stl_container_adapter.cpp
@@
-35,12
+35,13
@@
IF(BOOST_PYTHON_LIBRARY)
)
SET(MUSSA_LIBRARIES
mussa_core
)
SET(MUSSA_LIBRARIES
mussa_core
- ${B
OOST
_PYTHON_LIBRARY}
- ${B
OOST
_FILESYSTEM_LIBRARY}
- ${B
OOST
_SERIALIZATION_LIBRARY}
+ ${B
oost
_PYTHON_LIBRARY}
+ ${B
oost
_FILESYSTEM_LIBRARY}
+ ${B
oost
_SERIALIZATION_LIBRARY}
${OPENGL_gl_LIBRARY}
${OPENGL_gl_LIBRARY}
- optimized ${QT_QTCORE_LIBRARY_RELEASE}
- debug ${QT_QTCORE_LIBRARY_DEBUG}
+ ${QT_QTCORE_LIBRARY}
+ #optimized ${QT_QTCORE_LIBRARY_RELEASE}
+ #debug ${QT_QTCORE_LIBRARY_DEBUG}
)
GET_MUSSA_COMPILE_FLAGS(PY_CFLAGS)
GET_MUSSA_LINK_FLAGS(PY_LDFLAGS)
)
GET_MUSSA_COMPILE_FLAGS(PY_CFLAGS)
GET_MUSSA_LINK_FLAGS(PY_LDFLAGS)
@@
-77,10
+78,8
@@
IF(BOOST_PYTHON_LIBRARY)
mussa_qui
${MUSSA_LIBRARIES}
${PYTHON_LIBRARIES}
mussa_qui
${MUSSA_LIBRARIES}
${PYTHON_LIBRARIES}
- optimized ${QT_QTGUI_LIBRARY}
- debug ${QT_QTGUI_LIBRARY_DEBUG}
- optimized ${QT_QTOPENGL_LIBRARY}
- debug ${QT_QTOPENGL_LIBRARY_DEBUG}
+ ${QT_QTGUI_LIBRARY}
+ ${QT_QTOPENGL_LIBRARY}
)
SET_SOURCE_FILES_PROPERTIES(
)
SET_SOURCE_FILES_PROPERTIES(
@@
-105,7
+104,8
@@
IF(BOOST_PYTHON_LIBRARY)
ADD_TEST(TestFlp ${PYTHON_EXECUTABLE} ${PYTEST_DIR}/TestFlp.py)
ADD_TEST(TestMussa ${PYTHON_EXECUTABLE} ${PYTEST_DIR}/TestMussa.py)
ENDIF(PYTHON_EXECUTABLE)
ADD_TEST(TestFlp ${PYTHON_EXECUTABLE} ${PYTEST_DIR}/TestFlp.py)
ADD_TEST(TestMussa ${PYTHON_EXECUTABLE} ${PYTEST_DIR}/TestMussa.py)
ENDIF(PYTHON_EXECUTABLE)
-ELSE(BOOST_PYTHON_LIBRARY)
-ENDIF(BOOST_PYTHON_LIBRARY)
+ELSE(Boost_PYTHON_LIBRARY)
+ MESSAGE(STATUS "Not building mussa python extension, Boost python not found")
+ENDIF(Boost_PYTHON_LIBRARY)
ADD_SUBDIRECTORY(test)
ADD_SUBDIRECTORY(test)