X-Git-Url: http://woldlab.caltech.edu/gitweb/?p=mussa.git;a=blobdiff_plain;f=py%2Ftest%2FCMakeLists.txt;h=bbaf0a25af58c2569c1e4268a751c08c1dc6a8fc;hp=15c679910f4a88d2899acac1e4b70ef845315467;hb=HEAD;hpb=b968c482f87cc62a0ac79a7839ec6993644fd780

diff --git a/py/test/CMakeLists.txt b/py/test/CMakeLists.txt
index 15c6799..bbaf0a2 100644
--- a/py/test/CMakeLists.txt
+++ b/py/test/CMakeLists.txt
@@ -1,40 +1,44 @@
 FIND_PACKAGE(PythonLibs)
 
-INCLUDE(FindBoost)
+set(Boost_USE_STATIC_LIBS   OFF)
+set(Boost_USE_MULTITHREADED ON)
+FIND_PACKAGE(Boost 1.36.0 COMPONENTS program_options filesystem serialization python unit_test_framework )
 INCLUDE(Platform)
 
-SET(SOURCES test_python.cpp )
+IF(Boost_PYTHON_FOUND)
+  SET(SOURCES test_python.cpp )
 
-GET_MUSSA_COMPILE_FLAGS(PY_TEST_CFLAGS)
-GET_MUSSA_LINK_FLAGS(PY_TEST_LDFLAGS)
+  GET_MUSSA_COMPILE_FLAGS(PY_TEST_CFLAGS)
+  GET_MUSSA_LINK_FLAGS(PY_TEST_LDFLAGS)
 
-SET_SOURCE_FILES_PROPERTIES(
-  ${SOURCES} 
-  COMPILE_FLAGS "${PY_TEST_CFLAGS}"
-)
+  SET_SOURCE_FILES_PROPERTIES(
+    ${SOURCES} 
+    COMPILE_FLAGS "${PY_TEST_CFLAGS}"
+  )
 
-ADD_EXECUTABLE(mussa_python_test ${SOURCES})
-ADD_TEST(mussa_python_test ${CMAKE_BINARY_DIR}/py/test/mussa_python_test)
-LINK_DIRECTORIES(${CMAKE_BINARY_DIR}/alg})
-# Really it is important to go from library with the most dependencies to least
-TARGET_LINK_LIBRARIES(mussa_python_test
+  ADD_EXECUTABLE(mussa_python_test ${SOURCES})
+  ADD_TEST(mussa_python_test ${CMAKE_BINARY_DIR}/py/test/mussa_python_test)
+  LINK_DIRECTORIES(${CMAKE_BINARY_DIR}/alg})
+  # Really it is important to go from library with the most dependencies to least
+  TARGET_LINK_LIBRARIES(mussa_python_test
                         mussa_qui
                         mussa_py
                         mussa_core
                         ${QT_QTCORE_LIBRARY}
                         ${OPENGL_gl_LIBRARY}
-                        ${BOOST_PROGRAM_OPTIONS_LIBRARY}
-                        ${BOOST_FILESYSTEM_LIBRARY}
-                        ${BOOST_SERIALIZATION_LIBRARY}
-                        ${BOOST_PYTHON_LIBRARY}
+                        ${Boost_PROGRAM_OPTIONS_LIBRARY}
+                        ${Boost_FILESYSTEM_LIBRARY}
+                        ${Boost_SERIALIZATION_LIBRARY}
+                        ${Boost_PYTHON_LIBRARY}
                         ${PYTHON_LIBRARIES}
                         ${PYTHON_LINK_LIBRARIES}
-                        ${BOOST_UNIT_TEST_LIBRARY} 
+                        ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY} 
                         )
 
-SET_TARGET_PROPERTIES(
-  mussa_python_test PROPERTIES
-    COMPILE_FLAGS "${PY_TEST_CFLAGS}"
-    LINK_FLAGS "${PY_TEST_LDFLAGS}"
-)
+  SET_TARGET_PROPERTIES(
+    mussa_python_test PROPERTIES
+      COMPILE_FLAGS "${PY_TEST_CFLAGS}"
+      LINK_FLAGS "${PY_TEST_LDFLAGS}"
+  )
+ENDIF(Boost_PYTHON_FOUND)