upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-06 18:58:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix linking of C++ unit tests with CMake

Browse Source 
The problem with them is that the "libraries" into which Wesnoth is split
have circular dependencies, and linking of the game succeeds only by chance
(everything just happens to be used by the time the linker encounters it).

Fixed by allowing the linker to use multiple passes over the libraries
until all references are resolved.

(cherry-picked from commit e7ed3cbbb9ad474f2f89137fceece946eaa95e81)
This commit is contained in:
Jyrki Vesterinen 2018-04-07 13:15:01 +03:00
parent e81512ba83
commit 92f8e24796
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/CMakeLists.txt
View File

@ -282,6 +282,7 @@ if(ENABLE_GAME)
add_executable(wesnoth WIN32 wesnoth.cpp)
target_link_libraries(wesnoth
-Wl,--start-group
wesnoth-client
lua
wesnoth-core
@ -289,6 +290,7 @@ if(ENABLE_GAME)
wesnoth-sdl
${WIDGETS_LIB}
wesnoth-client
-Wl,--end-group
${game-external-libs}
)
set_target_properties(wesnoth
@ -362,6 +364,7 @@ if(ENABLE_TESTS)
add_executable(boost_unit_tests ${test_SRC})
target_link_libraries(boost_unit_tests
-Wl,--start-group
wesnoth-client
lua
wesnoth-core
@ -369,6 +372,7 @@ if(ENABLE_TESTS)
wesnoth-sdl
${WIDGETS_LIB}
wesnoth-client
-Wl,--end-group
${game-external-libs}
boost_unit_test_framework
)