diff options
author | Drew DeVault <sir@cmpwn.com> | 2016-04-28 14:37:35 -0400 |
---|---|---|
committer | Drew DeVault <sir@cmpwn.com> | 2016-04-28 14:37:35 -0400 |
commit | 17543d3e00ce6d185a226abf9aa3322bc1460607 (patch) | |
tree | 0707fbc4353bc7d233cb1bacd7052e021ad40850 | |
parent | Merge pull request #606 from mikkeloscar/tabbed-stacking-layout (diff) | |
parent | Respect supplied CMAKE_C_FLAGS (diff) | |
download | sway-17543d3e00ce6d185a226abf9aa3322bc1460607.tar.gz sway-17543d3e00ce6d185a226abf9aa3322bc1460607.tar.zst sway-17543d3e00ce6d185a226abf9aa3322bc1460607.zip |
Merge pull request #610 from sleep-walker/master
CMake related improvements
-rw-r--r-- | CMakeLists.txt | 2 | ||||
-rw-r--r-- | common/CMakeLists.txt | 3 | ||||
-rw-r--r-- | protocols/CMakeLists.txt | 3 | ||||
-rw-r--r-- | sway/CMakeLists.txt | 1 | ||||
-rw-r--r-- | swaybar/CMakeLists.txt | 3 | ||||
-rw-r--r-- | swaybg/CMakeLists.txt | 3 | ||||
-rw-r--r-- | swaygrab/CMakeLists.txt | 1 | ||||
-rw-r--r-- | swaylock/CMakeLists.txt | 3 | ||||
-rw-r--r-- | wayland/CMakeLists.txt | 3 |
9 files changed, 15 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index bf4fe49b..cf115b3d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.1.0) | |||
2 | 2 | ||
3 | project(sway C) | 3 | project(sway C) |
4 | 4 | ||
5 | set(CMAKE_C_FLAGS "-g") | 5 | set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g") |
6 | set(CMAKE_C_STANDARD 99) | 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) |
diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt index e5b8f2b9..9c2c0a99 100644 --- a/common/CMakeLists.txt +++ b/common/CMakeLists.txt | |||
@@ -1,8 +1,9 @@ | |||
1 | include_directories( | 1 | include_directories( |
2 | ${WLC_INCLUDE_DIRS} | 2 | ${WLC_INCLUDE_DIRS} |
3 | ${XKBCOMMON_INCLUDE_DIRS} | ||
3 | ) | 4 | ) |
4 | 5 | ||
5 | add_library(sway-common | 6 | add_library(sway-common STATIC |
6 | ipc-client.c | 7 | ipc-client.c |
7 | list.c | 8 | list.c |
8 | log.c | 9 | log.c |
diff --git a/protocols/CMakeLists.txt b/protocols/CMakeLists.txt index d7516d0c..ff0a2e4d 100644 --- a/protocols/CMakeLists.txt +++ b/protocols/CMakeLists.txt | |||
@@ -22,7 +22,7 @@ WAYLAND_ADD_PROTOCOL_SERVER(proto-server-swaylock | |||
22 | swaylock | 22 | swaylock |
23 | ) | 23 | ) |
24 | 24 | ||
25 | add_library(sway-protocols | 25 | add_library(sway-protocols STATIC |
26 | ${proto-client-xdg-shell} | 26 | ${proto-client-xdg-shell} |
27 | ${proto-client-desktop-shell} | 27 | ${proto-client-desktop-shell} |
28 | ${proto-server-desktop-shell} | 28 | ${proto-server-desktop-shell} |
@@ -31,3 +31,4 @@ add_library(sway-protocols | |||
31 | ) | 31 | ) |
32 | 32 | ||
33 | set(PROTOCOLS_INCLUDE_DIRS ${CMAKE_BINARY_DIR}/protocols PARENT_SCOPE) | 33 | set(PROTOCOLS_INCLUDE_DIRS ${CMAKE_BINARY_DIR}/protocols PARENT_SCOPE) |
34 | INCLUDE_DIRECTORIES(${WAYLAND_INCLUDE_DIR} ${XKBCOMMON_INCLUDE_DIRS}) | ||
diff --git a/sway/CMakeLists.txt b/sway/CMakeLists.txt index 51f27a05..73df3b1b 100644 --- a/sway/CMakeLists.txt +++ b/sway/CMakeLists.txt | |||
@@ -7,6 +7,7 @@ include_directories( | |||
7 | ${LIBINPUT_INCLUDE_DIRS} | 7 | ${LIBINPUT_INCLUDE_DIRS} |
8 | ${CAIRO_INCLUDE_DIRS} | 8 | ${CAIRO_INCLUDE_DIRS} |
9 | ${PANGO_INCLUDE_DIRS} | 9 | ${PANGO_INCLUDE_DIRS} |
10 | ${WAYLAND_INCLUDE_DIR} | ||
10 | ) | 11 | ) |
11 | 12 | ||
12 | add_executable(sway | 13 | add_executable(sway |
diff --git a/swaybar/CMakeLists.txt b/swaybar/CMakeLists.txt index 5b865083..f59a48fd 100644 --- a/swaybar/CMakeLists.txt +++ b/swaybar/CMakeLists.txt | |||
@@ -1,9 +1,10 @@ | |||
1 | include_directories( | 1 | include_directories( |
2 | ${PROTOCOLS_INCLUDE_DIRS} | 2 | ${PROTOCOLS_INCLUDE_DIRS} |
3 | ${WAYLAND_CLIENT_INCLUDE_DIR} | 3 | ${WAYLAND_INCLUDE_DIR} |
4 | ${CAIRO_INCLUDE_DIRS} | 4 | ${CAIRO_INCLUDE_DIRS} |
5 | ${PANGO_INCLUDE_DIRS} | 5 | ${PANGO_INCLUDE_DIRS} |
6 | ${JSONC_INCLUDE_DIRS} | 6 | ${JSONC_INCLUDE_DIRS} |
7 | ${XKBCOMMON_INCLUDE_DIRS} | ||
7 | ) | 8 | ) |
8 | 9 | ||
9 | add_executable(swaybar | 10 | add_executable(swaybar |
diff --git a/swaybg/CMakeLists.txt b/swaybg/CMakeLists.txt index c5efae91..f8cad404 100644 --- a/swaybg/CMakeLists.txt +++ b/swaybg/CMakeLists.txt | |||
@@ -1,8 +1,9 @@ | |||
1 | include_directories( | 1 | include_directories( |
2 | ${PROTOCOLS_INCLUDE_DIRS} | 2 | ${PROTOCOLS_INCLUDE_DIRS} |
3 | ${WAYLAND_CLIENT_INCLUDE_DIR} | 3 | ${WAYLAND_INCLUDE_DIR} |
4 | ${CAIRO_INCLUDE_DIRS} | 4 | ${CAIRO_INCLUDE_DIRS} |
5 | ${PANGO_INCLUDE_DIRS} | 5 | ${PANGO_INCLUDE_DIRS} |
6 | ${XKBCOMMON_INCLUDE_DIRS} | ||
6 | ) | 7 | ) |
7 | 8 | ||
8 | add_executable(swaybg | 9 | add_executable(swaybg |
diff --git a/swaygrab/CMakeLists.txt b/swaygrab/CMakeLists.txt index 888a9aee..b4aee357 100644 --- a/swaygrab/CMakeLists.txt +++ b/swaygrab/CMakeLists.txt | |||
@@ -1,6 +1,7 @@ | |||
1 | include_directories( | 1 | include_directories( |
2 | ${JSONC_INCLUDE_DIRS} | 2 | ${JSONC_INCLUDE_DIRS} |
3 | ${WLC_INCLUDE_DIRS} | 3 | ${WLC_INCLUDE_DIRS} |
4 | ${XKBCOMMON_INCLUDE_DIRS} | ||
4 | ) | 5 | ) |
5 | 6 | ||
6 | add_executable(swaygrab | 7 | add_executable(swaygrab |
diff --git a/swaylock/CMakeLists.txt b/swaylock/CMakeLists.txt index b290cd2f..febbd1af 100644 --- a/swaylock/CMakeLists.txt +++ b/swaylock/CMakeLists.txt | |||
@@ -1,10 +1,11 @@ | |||
1 | include_directories( | 1 | include_directories( |
2 | ${PROTOCOLS_INCLUDE_DIRS} | 2 | ${PROTOCOLS_INCLUDE_DIRS} |
3 | ${WAYLAND_CLIENT_INCLUDE_DIR} | 3 | ${WAYLAND_INCLUDE_DIR} |
4 | ${CAIRO_INCLUDE_DIRS} | 4 | ${CAIRO_INCLUDE_DIRS} |
5 | ${PANGO_INCLUDE_DIRS} | 5 | ${PANGO_INCLUDE_DIRS} |
6 | ${PAM_INCLUDE_DIRS} | 6 | ${PAM_INCLUDE_DIRS} |
7 | ${JSONC_INCLUDE_DIRS} | 7 | ${JSONC_INCLUDE_DIRS} |
8 | ${XKBCOMMON_INCLUDE_DIRS} | ||
8 | ) | 9 | ) |
9 | 10 | ||
10 | add_executable(swaylock | 11 | add_executable(swaylock |
diff --git a/wayland/CMakeLists.txt b/wayland/CMakeLists.txt index 282ea1aa..54fe3e23 100644 --- a/wayland/CMakeLists.txt +++ b/wayland/CMakeLists.txt | |||
@@ -2,9 +2,10 @@ include_directories( | |||
2 | ${PROTOCOLS_INCLUDE_DIRS} | 2 | ${PROTOCOLS_INCLUDE_DIRS} |
3 | ${PANGO_INCLUDE_DIRS} | 3 | ${PANGO_INCLUDE_DIRS} |
4 | ${XKBCOMMON_INCLUDE_DIRS} | 4 | ${XKBCOMMON_INCLUDE_DIRS} |
5 | ${WAYLAND_INCLUDE_DIR} | ||
5 | ) | 6 | ) |
6 | 7 | ||
7 | add_library(sway-wayland | 8 | add_library(sway-wayland STATIC |
8 | buffers.c | 9 | buffers.c |
9 | pango.c | 10 | pango.c |
10 | registry.c | 11 | registry.c |