Fix merge issues with the win32 library patch

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0ce4b69fabad78c8255c1ffe5fc046a9100e1ed3..2108fdc3103e0ff95b4ab92949b48e9662c2d3da 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -50,8 +50,12 @@ TARGET_LINK_LIBRARIES(mussagl
                         mussa_py
                         mussa_core
                         ${QT_LIBRARIES}
-                        ${BOOST_PROGRAM_OPTIONS_LIBRARY}
                         ${BOOST_FILESYSTEM_LIBRARY}
+                        ${BOOST_SERIALIZATION_LIBRARY}
+                        ${BOOST_PROGRAM_OPTIONS_LIBRARY}
+                        ${BOOST_PYTHON_LIBRARY}
+                        ${PYTHON_LIBRARIES}
+                        ${OPENGL_gl_LIBRARY}
                       )
 
 GET_MUSSA_COMPILE_FLAGS(MAIN_CFLAGS)

diff --git a/alg/test/CMakeLists.txt b/alg/test/CMakeLists.txt
index aca60711d59309a073f524398b049d820358e82d..64767bb99ff42e8b15219ff34bf2a67f452d0718 100644 (file)
--- a/alg/test/CMakeLists.txt
+++ b/alg/test/CMakeLists.txt
@@ -25,9 +25,10 @@ ADD_EXECUTABLE(unittest ${SOURCES})
 ADD_TEST(core_test ${CMAKE_BINARY_DIR}/alg/test/unittest)
 LINK_DIRECTORIES(${CMAKE_BINARY_DIR}/alg})
 TARGET_LINK_LIBRARIES(unittest 
-                        ${BOOST_UNIT_TEST_LIBRARY} 
-                        ${BOOST_FILESYSTEM_LIBRARY}
                         mussa_core 
+                        ${BOOST_FILESYSTEM_LIBRARY}
+                        ${BOOST_UNIT_TEST_LIBRARY} 
+                        ${BOOST_SERIALIZATION_LIBRARY}
                         ${OPENGL_gl_LIBRARY})
 
 SET_TARGET_PROPERTIES(