From 8d290fc5b7c661a0d414e9225e92cc52ad567946 Mon Sep 17 00:00:00 2001 From: "Ignacio R. Morelle" Date: Mon, 18 Apr 2016 21:57:46 -0300 Subject: [PATCH] cmake: Fix linking issues with wesnoth and test targets The GUI2 combobox widget code is linked into a separate .a library that does not include one of its dependencies, gui2::tdrop_down_list. This causes link order issues and renders the wesnoth and test targets unlinkable with GCC 5.3.1 and binutils 2.26 at least. --- src/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e60f160bf81..8c3c04fdcad 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -547,6 +547,7 @@ add_library(wesnoth-gui_tooltip # behavior of the widgets. It also contains the builder code # for the widgets since the code has inter dependencies. set(wesnoth-gui_widget_SRC + gui/dialogs/drop_down_list.cpp gui/widgets/button.cpp gui/widgets/combobox.cpp gui/widgets/container.cpp @@ -819,7 +820,6 @@ set(wesnoth-main_SRC gui/dialogs/depcheck_confirm_change.cpp gui/dialogs/depcheck_select_new.cpp gui/dialogs/dialog.cpp - gui/dialogs/drop_down_list.cpp gui/dialogs/edit_label.cpp gui/dialogs/editor/custom_tod.cpp gui/dialogs/editor/edit_label.cpp