Remember to include Platform to get PYTHON_LINK_LIBARIES

[mussa.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 04e576f104a39990c60d517bf79926ae773e3b6f..544a572f0ba0bb78192200b25be12d9eebefbf08 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,9 +1,10 @@
 PROJECT(mussa)
 
 ENABLE_TESTING()
-CMAKE_MINIMUM_REQUIRED(VERSION 2.2)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.4)
 # try to include our cmake modules
 SET (CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/makelib)
+INCLUDE(Platform)
 
 IF(NOT CMAKE_BUILD_TYPE)
   SET (CMAKE_BUILD_TYPE Debug CACHE STRING
@@ -11,9 +12,6 @@ IF(NOT CMAKE_BUILD_TYPE)
       FORCE)
 ENDIF(NOT CMAKE_BUILD_TYPE)
 
-# configure python
-SET(USE_PYTHON 1)
-
 # include packages we depend on
 FIND_PACKAGE(Qt4)
 SET(QT_USE_QTOPENGL 1)
@@ -26,6 +24,11 @@ FIND_PACKAGE(OpenGL)
 FIND_PACKAGE(Boost)
 FIND_PACKAGE(PythonLibs)
 
+INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_PATH} 
+                    ${QT_INCLUDES}
+                    ${BOOST_INCLUDE_DIR} )
+
+
 # all of our source files al relative to the root of our project
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR})
 ADD_SUBDIRECTORY( doc )
@@ -35,28 +38,28 @@ ADD_SUBDIRECTORY( py )
 
 SET(MAIN_SOURCES
       qui/mussagl.cpp)
+
 ADD_EXECUTABLE(mussagl WIN32 MACOSX_BUNDLE ${MAIN_SOURCES} )
 
+
+SET(PYTHON_CFLAGS "-DUSE_PYTHON")
+
+# For windows you need to go from library with the most dependencies
+# to the library with the least dependencies -diane
 TARGET_LINK_LIBRARIES(mussagl 
-                        mussa_core
                         mussa_qui
+                        mussa_py
+                        mussa_core
                         ${QT_LIBRARIES}
-                        ${OPENGL_gl_LIBRARY}
-                        ${BOOST_PROGRAM_OPTIONS_LIBRARY}
                         ${BOOST_FILESYSTEM_LIBRARY}
+                        ${BOOST_SERIALIZATION_LIBRARY}
+                        ${BOOST_PROGRAM_OPTIONS_LIBRARY}
+                        ${BOOST_PYTHON_LIBRARY}
+                        ${PYTHON_LIBRARIES}
+                        ${PYTHON_LINK_LIBRARIES}
+                        ${OPENGL_gl_LIBRARY}
                       )
 
-IF(USE_PYTHON)
-  INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_PATH})
-  SET(PYTHON_CFLAGS "-DUSE_PYTHON")
-  TARGET_LINK_LIBRARIES(mussagl
-                          mussa_py
-                          ${BOOST_PYTHON_LIBRARY}
-                          optimized ${PYTHON_LIBRARIES}
-                          debug ${PYTHON_DEBUG_LIBRARIES}
-                        )
-ENDIF(USE_PYTHON)
-
 GET_MUSSA_COMPILE_FLAGS(MAIN_CFLAGS)
 GET_MUSSA_LINK_FLAGS(MAIN_LDFLAGS)