Commit 14d2ec80e741ab6092f183f2707e10b2de920470

Sam Lantinga 2018-09-28T21:03:39

commit 8f4dedc039190f5e734c47dcc4fc021b5793b659 Author: Micha? Janiszewski <janisozaur+signed@gmail.com> Date: Fri Sep 28 20:38:04 2018 +0200 CMake: fix building tests on Linux In case where libunwind.h has been found, it will be used by compiler, but linker wasn't updated to reflect use of this new library.

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0840f71..c213bc4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1059,6 +1059,12 @@ elseif(UNIX AND NOT APPLE AND NOT ANDROID)
         include_directories(${IBUS_INCLUDE_DIRS})
         list(APPEND EXTRA_LIBS ${IBUS_LIBRARIES})
       endif()
+      if(HAVE_LIBUNWIND_H)
+        # We've already found the header, so REQUIRE the lib to be present
+        pkg_search_module(UNWIND REQUIRED libunwind)
+        pkg_search_module(UNWIND_GENERIC REQUIRED libunwind-generic)
+        list(APPEND EXTRA_LIBS ${UNWIND_LIBRARIES} ${UNWIND_GENERIC_LIBRARIES})
+      endif()
     endif()
 
     check_include_file("fcitx/frontend.h" HAVE_FCITX_FRONTEND_H)