summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar robotanarchy <robotanarchy@bingo-ev.de>2015-12-22 00:32:41 +0100
committerLibravatar robotanarchy <robotanarchy@bingo-ev.de>2015-12-22 00:32:41 +0100
commit470e59b291b7c5e416f5c43bf14dedb8c379b25e (patch)
tree666437c6bf7e764753d7765ffbdda45ecfd05d9d
parentadd -fPIC flag (position independent code) like in wlc (diff)
downloadsway-470e59b291b7c5e416f5c43bf14dedb8c379b25e.tar.gz
sway-470e59b291b7c5e416f5c43bf14dedb8c379b25e.tar.zst
sway-470e59b291b7c5e416f5c43bf14dedb8c379b25e.zip
fix backtrace detection in CMake
works on arch (glibc) and void linux (tested with musl libc) now
-rw-r--r--CMakeLists.txt4
-rw-r--r--common/CMakeLists.txt8
2 files changed, 9 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index bb13ef96..4c349865 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -61,9 +61,9 @@ find_package(PAM)
61 61
62find_package(Backtrace) 62find_package(Backtrace)
63if(Backtrace_FOUND) 63if(Backtrace_FOUND)
64 include_directories(${Backtrace_INCLUDE_DIRS}) 64 include_directories("${Backtrace_INCLUDE_DIRS}")
65 target_link_libraries(${Backtrace_LIBRARIES})
66 add_definitions(-DSWAY_Backtrace_FOUND=1) 65 add_definitions(-DSWAY_Backtrace_FOUND=1)
66 set(LINK_LIBRARIES, "${LINK_LIBRARIES} ${Backtrace_LIBRARIES}")
67 set(SWAY_Backtrace_HEADER "${Backtrace_HEADER}") 67 set(SWAY_Backtrace_HEADER "${Backtrace_HEADER}")
68endif() 68endif()
69 69
diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index 95617e15..38767249 100644
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -1,5 +1,4 @@
1add_library(sway-common 1add_library(sway-common
2 ${SWAY_Backtrace_HEADER}
3 ipc-client.c 2 ipc-client.c
4 list.c 3 list.c
5 log.c 4 log.c
@@ -7,3 +6,10 @@ add_library(sway-common
7 readline.c 6 readline.c
8 stringop.c 7 stringop.c
9 ) 8 )
9
10if(Backtrace_FOUND)
11 set_target_properties(sway-common
12 PROPERTIES
13 COMPILE_FLAGS "-include ${Backtrace_HEADER}"
14 )
15endif()