Test for RST2HTML and BOOST_PYTHON_LIB

[mussa.git] / py / CMakeLists.txt

diff --git a/py/CMakeLists.txt b/py/CMakeLists.txt
index 3599bdf8684d6cf8ad808869ae0019eb1548c274..48bfbe75e405de696357d7af7ab2dac008598dc4 100644 (file)
--- a/py/CMakeLists.txt
+++ b/py/CMakeLists.txt
@@ -3,11 +3,13 @@ FIND_PACKAGE(OpenGL)
 FIND_PACKAGE(PythonLibs)
 FIND_PACKAGE(PythonInterp)
 SET(QT_USE_QTOPENGL 1)
+SET(QT_USE_QTASSISTANT 1)
+SET(QT_USE_QTNETWORK 1)
 FIND_PACKAGE(Qt4)
 INCLUDE( ${QT_USE_FILE} )
 
 
-# IF(BOOST_PYTHON_LIB)
+IF(BOOST_PYTHON_LIB)
   INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_PATH} ${QT_INCLUDES})
   SET(SOURCES 
         conserved_path.cpp 
@@ -21,28 +23,27 @@ INCLUDE( ${QT_USE_FILE} )
   
   #SET_SOURCE_FILES_PROPERTIES(${SOURCES} COM
 
-  ADD_LIBRARY(_mussa MODULE ${SOURCES})
+  ADD_LIBRARY(mussa MODULE ${SOURCES})
   ADD_LIBRARY(mussa_py STATIC ${SOURCES})
-  ADD_CUSTOM_TARGET(_mussa.so ALL
-                     COMMAND cp lib_mussa.so _mussa.so
-                     DEPENDS _mussa)
+  ADD_CUSTOM_TARGET(mussa.so ALL
+                     COMMAND cp libmussa.so mussa.so
+                     DEPENDS mussa)
   LINK_DIRECTORIES(${MUSSA_BINARY_DIR}/alg)
-  TARGET_LINK_LIBRARIES(_mussa 
+  TARGET_LINK_LIBRARIES(mussa 
                           mussa_core
                           mussa_qui
                           ${BOOST_PYTHON_LIBRARY}
                           ${BOOST_FILESYSTEM_LIBRARY}
                           ${OPENGL_gl_LIBRARY}
                           ${PYTHON_LIBRARIES}
-                          ${QT_QTCORE_LIBRARY}
-                          ${QT_QTGUI_LIBRARY}
-                          ${QT_QTOPENGL_LIBRARY}
+                          ${QT_LIBRARIES} 
                         )
 
   IF(PYTHON_EXECUTABLE)
     SET(PYTHON_TEST_DIR ${CMAKE_SOURCE_DIR}/py/test/)
-    ADD_TEST(sequence ${PYTHON_EXECUTABLE} ${PYTHON_TEST_DIR}/TestSequence.py)
+    ADD_TEST(sequence_py 
+             ${PYTHON_EXECUTABLE} ${PYTHON_TEST_DIR}/TestSequence.py)
   ENDIF(PYTHON_EXECUTABLE)
-#ELSE(BOOST_PYTHON_LIB)
-#ENDIF(BOOST_PYTHON_LIB)
+ELSE(BOOST_PYTHON_LIB)
+ENDIF(BOOST_PYTHON_LIB)