diff options
author | Christoph Gysin <christoph.gysin@gmail.com> | 2015-12-01 22:37:08 +0200 |
---|---|---|
committer | Christoph Gysin <christoph.gysin@gmail.com> | 2015-12-01 22:47:22 +0200 |
commit | c9ce15aa1874f31ed21bc6890a26366c5fabc2d3 (patch) | |
tree | f8def069a1474c27cfb042736424c1a438e2271d | |
parent | cmake: extract sway (diff) | |
download | sway-c9ce15aa1874f31ed21bc6890a26366c5fabc2d3.tar.gz sway-c9ce15aa1874f31ed21bc6890a26366c5fabc2d3.tar.zst sway-c9ce15aa1874f31ed21bc6890a26366c5fabc2d3.zip |
cmake: remove subprojects
-rw-r--r-- | swaybar/CMakeLists.txt | 12 | ||||
-rw-r--r-- | swaybg/CMakeLists.txt | 12 | ||||
-rw-r--r-- | swaygrab/CMakeLists.txt | 6 | ||||
-rw-r--r-- | swaymsg/CMakeLists.txt | 6 |
4 files changed, 14 insertions, 22 deletions
diff --git a/swaybar/CMakeLists.txt b/swaybar/CMakeLists.txt index ea35134f..c14b5f75 100644 --- a/swaybar/CMakeLists.txt +++ b/swaybar/CMakeLists.txt | |||
@@ -1,16 +1,14 @@ | |||
1 | project(swaybar) | ||
2 | |||
3 | find_package(Wayland REQUIRED) | 1 | find_package(Wayland REQUIRED) |
4 | find_package(Cairo REQUIRED) | 2 | find_package(Cairo REQUIRED) |
5 | find_package(Pango REQUIRED) | 3 | find_package(Pango REQUIRED) |
6 | 4 | ||
7 | include(Wayland) | 5 | include(Wayland) |
8 | WAYLAND_ADD_PROTOCOL_CLIENT(proto-xdg-shell | 6 | WAYLAND_ADD_PROTOCOL_CLIENT(proto-xdg-shell |
9 | ${PROJECT_SOURCE_DIR}/../protocols/xdg-shell.xml | 7 | ../protocols/xdg-shell.xml |
10 | xdg-shell | 8 | xdg-shell |
11 | ) | 9 | ) |
12 | WAYLAND_ADD_PROTOCOL_CLIENT(proto-desktop-shell | 10 | WAYLAND_ADD_PROTOCOL_CLIENT(proto-desktop-shell |
13 | ${PROJECT_SOURCE_DIR}/../protocols/desktop-shell.xml | 11 | ../protocols/desktop-shell.xml |
14 | desktop-shell | 12 | desktop-shell |
15 | ) | 13 | ) |
16 | 14 | ||
@@ -21,9 +19,9 @@ include_directories( | |||
21 | ${CMAKE_CURRENT_BINARY_DIR} | 19 | ${CMAKE_CURRENT_BINARY_DIR} |
22 | ) | 20 | ) |
23 | 21 | ||
24 | file(GLOB sources ${PROJECT_SOURCE_DIR}/*.c) | 22 | file(GLOB sources *.c) |
25 | file(GLOB common ${PROJECT_SOURCE_DIR}/../common/*.c) | 23 | file(GLOB common ../common/*.c) |
26 | file(GLOB wl_sources ${PROJECT_SOURCE_DIR}/../wayland/*.c) | 24 | file(GLOB wl_sources ../wayland/*.c) |
27 | 25 | ||
28 | add_executable(swaybar | 26 | add_executable(swaybar |
29 | ${sources} | 27 | ${sources} |
diff --git a/swaybg/CMakeLists.txt b/swaybg/CMakeLists.txt index 8016d959..9d3cc547 100644 --- a/swaybg/CMakeLists.txt +++ b/swaybg/CMakeLists.txt | |||
@@ -1,16 +1,14 @@ | |||
1 | project(swaybg) | ||
2 | |||
3 | find_package(Wayland REQUIRED) | 1 | find_package(Wayland REQUIRED) |
4 | find_package(Cairo REQUIRED) | 2 | find_package(Cairo REQUIRED) |
5 | find_package(Pango REQUIRED) | 3 | find_package(Pango REQUIRED) |
6 | 4 | ||
7 | include(Wayland) | 5 | include(Wayland) |
8 | WAYLAND_ADD_PROTOCOL_CLIENT(proto-xdg-shell | 6 | WAYLAND_ADD_PROTOCOL_CLIENT(proto-xdg-shell |
9 | ${PROJECT_SOURCE_DIR}/../protocols/xdg-shell.xml | 7 | ../protocols/xdg-shell.xml |
10 | xdg-shell | 8 | xdg-shell |
11 | ) | 9 | ) |
12 | WAYLAND_ADD_PROTOCOL_CLIENT(proto-desktop-shell | 10 | WAYLAND_ADD_PROTOCOL_CLIENT(proto-desktop-shell |
13 | ${PROJECT_SOURCE_DIR}/../protocols/desktop-shell.xml | 11 | ../protocols/desktop-shell.xml |
14 | desktop-shell | 12 | desktop-shell |
15 | ) | 13 | ) |
16 | 14 | ||
@@ -21,9 +19,9 @@ include_directories( | |||
21 | ${CMAKE_CURRENT_BINARY_DIR} | 19 | ${CMAKE_CURRENT_BINARY_DIR} |
22 | ) | 20 | ) |
23 | 21 | ||
24 | file(GLOB sources ${PROJECT_SOURCE_DIR}/*.c) | 22 | file(GLOB sources *.c) |
25 | file(GLOB common ${PROJECT_SOURCE_DIR}/../common/*.c) | 23 | file(GLOB common ../common/*.c) |
26 | file(GLOB wl_sources ${PROJECT_SOURCE_DIR}/../wayland/*.c) | 24 | file(GLOB wl_sources ../wayland/*.c) |
27 | 25 | ||
28 | add_executable(swaybg | 26 | add_executable(swaybg |
29 | ${sources} | 27 | ${sources} |
diff --git a/swaygrab/CMakeLists.txt b/swaygrab/CMakeLists.txt index efe8986b..77d96412 100644 --- a/swaygrab/CMakeLists.txt +++ b/swaygrab/CMakeLists.txt | |||
@@ -1,7 +1,5 @@ | |||
1 | project(swaygrab) | 1 | file(GLOB sources *.c) |
2 | 2 | file(GLOB common ../common/*.c) | |
3 | file(GLOB sources ${PROJECT_SOURCE_DIR}/*.c) | ||
4 | file(GLOB common ${PROJECT_SOURCE_DIR}/../common/*.c) | ||
5 | 3 | ||
6 | add_executable(swaygrab | 4 | add_executable(swaygrab |
7 | ${sources} | 5 | ${sources} |
diff --git a/swaymsg/CMakeLists.txt b/swaymsg/CMakeLists.txt index 2671dc2c..7616d942 100644 --- a/swaymsg/CMakeLists.txt +++ b/swaymsg/CMakeLists.txt | |||
@@ -1,7 +1,5 @@ | |||
1 | project(swaymsg) | 1 | file(GLOB sources *.c) |
2 | 2 | file(GLOB common ../common/*.c) | |
3 | file(GLOB sources ${PROJECT_SOURCE_DIR}/*.c) | ||
4 | file(GLOB common ${PROJECT_SOURCE_DIR}/../common/*.c) | ||
5 | 3 | ||
6 | add_executable(swaymsg | 4 | add_executable(swaymsg |
7 | ${sources} | 5 | ${sources} |