aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Christoph Gysin <christoph.gysin@gmail.com>2015-12-01 22:37:08 +0200
committerLibravatar Christoph Gysin <christoph.gysin@gmail.com>2015-12-01 22:47:22 +0200
commitc9ce15aa1874f31ed21bc6890a26366c5fabc2d3 (patch)
treef8def069a1474c27cfb042736424c1a438e2271d
parentcmake: extract sway (diff)
downloadsway-c9ce15aa1874f31ed21bc6890a26366c5fabc2d3.tar.gz
sway-c9ce15aa1874f31ed21bc6890a26366c5fabc2d3.tar.zst
sway-c9ce15aa1874f31ed21bc6890a26366c5fabc2d3.zip
cmake: remove subprojects
-rw-r--r--swaybar/CMakeLists.txt12
-rw-r--r--swaybg/CMakeLists.txt12
-rw-r--r--swaygrab/CMakeLists.txt6
-rw-r--r--swaymsg/CMakeLists.txt6
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 @@
1project(swaybar)
2
3find_package(Wayland REQUIRED) 1find_package(Wayland REQUIRED)
4find_package(Cairo REQUIRED) 2find_package(Cairo REQUIRED)
5find_package(Pango REQUIRED) 3find_package(Pango REQUIRED)
6 4
7include(Wayland) 5include(Wayland)
8WAYLAND_ADD_PROTOCOL_CLIENT(proto-xdg-shell 6WAYLAND_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)
12WAYLAND_ADD_PROTOCOL_CLIENT(proto-desktop-shell 10WAYLAND_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
24file(GLOB sources ${PROJECT_SOURCE_DIR}/*.c) 22file(GLOB sources *.c)
25file(GLOB common ${PROJECT_SOURCE_DIR}/../common/*.c) 23file(GLOB common ../common/*.c)
26file(GLOB wl_sources ${PROJECT_SOURCE_DIR}/../wayland/*.c) 24file(GLOB wl_sources ../wayland/*.c)
27 25
28add_executable(swaybar 26add_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 @@
1project(swaybg)
2
3find_package(Wayland REQUIRED) 1find_package(Wayland REQUIRED)
4find_package(Cairo REQUIRED) 2find_package(Cairo REQUIRED)
5find_package(Pango REQUIRED) 3find_package(Pango REQUIRED)
6 4
7include(Wayland) 5include(Wayland)
8WAYLAND_ADD_PROTOCOL_CLIENT(proto-xdg-shell 6WAYLAND_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)
12WAYLAND_ADD_PROTOCOL_CLIENT(proto-desktop-shell 10WAYLAND_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
24file(GLOB sources ${PROJECT_SOURCE_DIR}/*.c) 22file(GLOB sources *.c)
25file(GLOB common ${PROJECT_SOURCE_DIR}/../common/*.c) 23file(GLOB common ../common/*.c)
26file(GLOB wl_sources ${PROJECT_SOURCE_DIR}/../wayland/*.c) 24file(GLOB wl_sources ../wayland/*.c)
27 25
28add_executable(swaybg 26add_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 @@
1project(swaygrab) 1file(GLOB sources *.c)
2 2file(GLOB common ../common/*.c)
3file(GLOB sources ${PROJECT_SOURCE_DIR}/*.c)
4file(GLOB common ${PROJECT_SOURCE_DIR}/../common/*.c)
5 3
6add_executable(swaygrab 4add_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 @@
1project(swaymsg) 1file(GLOB sources *.c)
2 2file(GLOB common ../common/*.c)
3file(GLOB sources ${PROJECT_SOURCE_DIR}/*.c)
4file(GLOB common ${PROJECT_SOURCE_DIR}/../common/*.c)
5 3
6add_executable(swaymsg 4add_executable(swaymsg
7 ${sources} 5 ${sources}