widelands-dev team mailing list archive

["Jens Beyer \(Qcumber-some\)" <Qcumber-some@xxxxxxxxxxxxx>]

Jens Beyer (Qcumber-some) has proposed merging lp:~qcumber-some/widelands/bug961548 into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #961548 in widelands: "widelands executable links against boost_unit_test_framework in Debug mode"
  https://bugs.launchpad.net/widelands/+bug/961548

For more details, see:
https://code.launchpad.net/~qcumber-some/widelands/bug961548/+merge/102581

Separate the libraries to link against if unit tests are enabled.
-- 
https://code.launchpad.net/~qcumber-some/widelands/bug961548/+merge/102581
Your team Widelands Developers is requested to review the proposed merge of lp:~qcumber-some/widelands/bug961548 into lp:widelands.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2012-04-02 16:02:45 +0000
+++ CMakeLists.txt	2012-04-18 20:14:23 +0000
@@ -107,11 +107,11 @@
 # unit_test_framework is for testing only
 if (WL_UNIT_TESTS)
   message(STATUS "Enabled unit tests")
-if (DEFINED MSVC)
-  set (BUILD_SHARED_LIBS OFF)
-else (DEFINED MSVC)
-  set (Boost_USE_STATIC_LIBS  OFF)
-endif (DEFINED MSVC)
+  if (DEFINED MSVC)
+    set (BUILD_SHARED_LIBS OFF)
+  else (DEFINED MSVC)
+    set (Boost_USE_STATIC_LIBS  OFF)
+  endif (DEFINED MSVC)
   set (Boost_FIND_COMPONENTS unit_test_framework signals)
   set (Boost_USE_MULTITHREADED ON)
   set (Boost_DETAILED_FAILURE_MSG ON)

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2012-03-03 19:23:20 +0000
+++ src/CMakeLists.txt	2012-04-18 20:14:23 +0000
@@ -122,7 +122,7 @@
 target_link_libraries(widelands_all ${ZLIB_LIBRARY})
 target_link_libraries(widelands_all ${OPENGL_gl_LIBRARY})
 target_link_libraries(widelands_all ${GLEW_LIBRARY})
-target_link_libraries(widelands_all ${Boost_LIBRARIES})
+target_link_libraries(widelands_all ${Boost_SIGNALS_LIBRARY})
 if (CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
   target_link_libraries(widelands_all ${EXECINFO_LIBRARY})
 endif (CMAKE_SYSTEM_NAME MATCHES "FreeBSD")

=== modified file 'src/economy/test/CMakeLists.txt'
--- src/economy/test/CMakeLists.txt	2011-01-21 18:20:25 +0000
+++ src/economy/test/CMakeLists.txt	2012-04-18 20:14:23 +0000
@@ -3,7 +3,7 @@
 add_executable(test_economy ${WL_TEST_ECONOMY_SRCS} ${TEST_EXTRA_SOURCES})
 
 target_link_libraries(test_economy widelands_all)
-target_link_libraries(test_economy ${Boost_LIBRARIES})
+target_link_libraries(test_economy ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 target_link_libraries(test_economy ${TEST_EXTRA_LIBS})
 
 add_test(test_economy test_economy)

=== modified file 'src/io/filesystem/test/CMakeLists.txt'
--- src/io/filesystem/test/CMakeLists.txt	2011-02-11 20:45:58 +0000
+++ src/io/filesystem/test/CMakeLists.txt	2012-04-18 20:14:23 +0000
@@ -3,7 +3,7 @@
 add_executable(test_io_filesystem ${WL_TEST_IO_FILESYSTEM_SRCS} ${TEST_EXTRA_SOURCES})
 
 target_link_libraries(test_io_filesystem widelands_all)
-target_link_libraries(test_io_filesystem ${Boost_LIBRARIES})
+target_link_libraries(test_io_filesystem ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 target_link_libraries(test_io_filesystem ${TEST_EXTRA_LIBS})
 
 add_test(test_io_filesystem test_io_filesystem)

=== modified file 'src/scripting/test/CMakeLists.txt'
--- src/scripting/test/CMakeLists.txt	2011-01-21 18:20:25 +0000
+++ src/scripting/test/CMakeLists.txt	2012-04-18 20:14:23 +0000
@@ -3,7 +3,7 @@
 add_executable(test_widelands_scripting ${WL_SCRIPTING_TEST_SRCS} ${TEST_EXTRA_SOURCES})
 
 target_link_libraries(test_widelands_scripting widelands_all)
-target_link_libraries(test_widelands_scripting ${Boost_LIBRARIES})
+target_link_libraries(test_widelands_scripting ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 target_link_libraries(test_widelands_scripting ${TEST_EXTRA_LIBS})
 
 add_test(test_widelands_scripting test_widelands_scripting)