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]
/
py
/
CMakeLists.txt
diff --git
a/py/CMakeLists.txt
b/py/CMakeLists.txt
index c47574269e1146e36ec338ca83fb522e9b345526..dbfdb2d3c4e3ae0974b6063dcbe6e443c532425e 100644
(file)
--- a/
py/CMakeLists.txt
+++ b/
py/CMakeLists.txt
@@
-1,4
+1,6
@@
-FIND_PACKAGE(Boost)
+set(Boost_USE_STATIC_LIBS OFF)
+set(Boost_USE_MULTITHREADED ON)
+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
+9,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
@@
-16,6
+18,7
@@
IF(BOOST_PYTHON_LIBRARY)
annotation_colors.cpp
annotations.cpp
conserved_path.cpp
annotation_colors.cpp
annotations.cpp
conserved_path.cpp
+ drawable.cpp
flp.cpp
glsequence.cpp
module.cpp
flp.cpp
glsequence.cpp
module.cpp
@@
-34,12
+37,14
@@
IF(BOOST_PYTHON_LIBRARY)
)
SET(MUSSA_LIBRARIES
mussa_core
)
SET(MUSSA_LIBRARIES
mussa_core
- ${BOOST_PYTHON_LIBRARY}
- ${BOOST_FILESYSTEM_LIBRARY}
- ${BOOST_SERIALIZATION_LIBRARY}
+ ${Boost_PYTHON_LIBRARY}
+ ${Boost_SYSTEM_LIBRARY}
+ ${Boost_FILESYSTEM_LIBRARY}
+ ${Boost_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)
@@
-76,10
+81,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(
@@
-104,7
+107,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)