diff options
author | 2017-03-13 07:35:12 -0400 | |
---|---|---|
committer | 2017-03-13 07:35:12 -0400 | |
commit | b507462d1c66e11cce76e069a508621dc9599f07 (patch) | |
tree | 52cc52fb0ec42085c37bee5f4f2e5c5f10cf2631 /CMakeLists.txt | |
parent | deprecate new_window and new_float commands (diff) | |
parent | Merge pull request #1113 from johnchen902/patch-1 (diff) | |
download | sway-b507462d1c66e11cce76e069a508621dc9599f07.tar.gz sway-b507462d1c66e11cce76e069a508621dc9599f07.tar.zst sway-b507462d1c66e11cce76e069a508621dc9599f07.zip |
Merge branch 'master' of git://github.com/SirCmpwn/sway into new-command-aliases
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r-- | CMakeLists.txt | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 685e8fc7..ec2c73a2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
@@ -7,9 +7,6 @@ set(CMAKE_C_STANDARD 99) | |||
7 | set(CMAKE_C_EXTENSIONS OFF) | 7 | set(CMAKE_C_EXTENSIONS OFF) |
8 | set(CMAKE_POSITION_INDEPENDENT_CODE ON) | 8 | set(CMAKE_POSITION_INDEPENDENT_CODE ON) |
9 | set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin) | 9 | set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin) |
10 | add_definitions( | ||
11 | -D_GNU_SOURCE | ||
12 | ) | ||
13 | set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall") | 10 | set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall") |
14 | set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wextra") | 11 | set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wextra") |
15 | set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-parameter") | 12 | set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-parameter") |
@@ -70,14 +67,6 @@ find_package(PAM) | |||
70 | 67 | ||
71 | find_package(LibInput REQUIRED) | 68 | find_package(LibInput REQUIRED) |
72 | 69 | ||
73 | find_package(Backtrace) | ||
74 | if(Backtrace_FOUND) | ||
75 | include_directories("${Backtrace_INCLUDE_DIRS}") | ||
76 | add_definitions(-DSWAY_Backtrace_FOUND=1) | ||
77 | set(LINK_LIBRARIES, "${LINK_LIBRARIES} ${Backtrace_LIBRARIES}") | ||
78 | set(SWAY_Backtrace_HEADER "${Backtrace_HEADER}") | ||
79 | endif() | ||
80 | |||
81 | if (CMAKE_SYSTEM_NAME STREQUAL FreeBSD) | 70 | if (CMAKE_SYSTEM_NAME STREQUAL FreeBSD) |
82 | find_package(EpollShim REQUIRED) | 71 | find_package(EpollShim REQUIRED) |
83 | endif (CMAKE_SYSTEM_NAME STREQUAL FreeBSD) | 72 | endif (CMAKE_SYSTEM_NAME STREQUAL FreeBSD) |