diff options
| author | robotanarchy <robotanarchy@bingo-ev.de> | 2015-12-22 00:32:41 +0100 |
|---|---|---|
| committer | robotanarchy <robotanarchy@bingo-ev.de> | 2015-12-22 00:32:41 +0100 |
| commit | 470e59b291b7c5e416f5c43bf14dedb8c379b25e (patch) | |
| tree | 666437c6bf7e764753d7765ffbdda45ecfd05d9d | |
| parent | 03c041dd30315125b72699a90085718ebdc13248 (diff) | |
fix backtrace detection in CMake
works on arch (glibc) and void linux (tested with musl libc) now
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | common/CMakeLists.txt | 8 |
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) find_package(Backtrace) if(Backtrace_FOUND) - include_directories(${Backtrace_INCLUDE_DIRS}) - target_link_libraries(${Backtrace_LIBRARIES}) + include_directories("${Backtrace_INCLUDE_DIRS}") add_definitions(-DSWAY_Backtrace_FOUND=1) + set(LINK_LIBRARIES, "${LINK_LIBRARIES} ${Backtrace_LIBRARIES}") set(SWAY_Backtrace_HEADER "${Backtrace_HEADER}") endif() 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 @@ add_library(sway-common - ${SWAY_Backtrace_HEADER} ipc-client.c list.c log.c @@ -7,3 +6,10 @@ add_library(sway-common readline.c stringop.c ) + +if(Backtrace_FOUND) + set_target_properties(sway-common + PROPERTIES + COMPILE_FLAGS "-include ${Backtrace_HEADER}" + ) +endif() |