From c9ce15aa1874f31ed21bc6890a26366c5fabc2d3 Mon Sep 17 00:00:00 2001 From: Christoph Gysin Date: Tue, 1 Dec 2015 22:37:08 +0200 Subject: [PATCH] cmake: remove subprojects --- swaybar/CMakeLists.txt | 12 +++++------- swaybg/CMakeLists.txt | 12 +++++------- swaygrab/CMakeLists.txt | 6 ++---- 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 @@ -project(swaybar) - find_package(Wayland REQUIRED) find_package(Cairo REQUIRED) find_package(Pango REQUIRED) include(Wayland) WAYLAND_ADD_PROTOCOL_CLIENT(proto-xdg-shell - ${PROJECT_SOURCE_DIR}/../protocols/xdg-shell.xml + ../protocols/xdg-shell.xml xdg-shell ) WAYLAND_ADD_PROTOCOL_CLIENT(proto-desktop-shell - ${PROJECT_SOURCE_DIR}/../protocols/desktop-shell.xml + ../protocols/desktop-shell.xml desktop-shell ) @@ -21,9 +19,9 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ) -file(GLOB sources ${PROJECT_SOURCE_DIR}/*.c) -file(GLOB common ${PROJECT_SOURCE_DIR}/../common/*.c) -file(GLOB wl_sources ${PROJECT_SOURCE_DIR}/../wayland/*.c) +file(GLOB sources *.c) +file(GLOB common ../common/*.c) +file(GLOB wl_sources ../wayland/*.c) add_executable(swaybar ${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 @@ -project(swaybg) - find_package(Wayland REQUIRED) find_package(Cairo REQUIRED) find_package(Pango REQUIRED) include(Wayland) WAYLAND_ADD_PROTOCOL_CLIENT(proto-xdg-shell - ${PROJECT_SOURCE_DIR}/../protocols/xdg-shell.xml + ../protocols/xdg-shell.xml xdg-shell ) WAYLAND_ADD_PROTOCOL_CLIENT(proto-desktop-shell - ${PROJECT_SOURCE_DIR}/../protocols/desktop-shell.xml + ../protocols/desktop-shell.xml desktop-shell ) @@ -21,9 +19,9 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ) -file(GLOB sources ${PROJECT_SOURCE_DIR}/*.c) -file(GLOB common ${PROJECT_SOURCE_DIR}/../common/*.c) -file(GLOB wl_sources ${PROJECT_SOURCE_DIR}/../wayland/*.c) +file(GLOB sources *.c) +file(GLOB common ../common/*.c) +file(GLOB wl_sources ../wayland/*.c) add_executable(swaybg ${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 @@ -project(swaygrab) - -file(GLOB sources ${PROJECT_SOURCE_DIR}/*.c) -file(GLOB common ${PROJECT_SOURCE_DIR}/../common/*.c) +file(GLOB sources *.c) +file(GLOB common ../common/*.c) add_executable(swaygrab ${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 @@ -project(swaymsg) - -file(GLOB sources ${PROJECT_SOURCE_DIR}/*.c) -file(GLOB common ${PROJECT_SOURCE_DIR}/../common/*.c) +file(GLOB sources *.c) +file(GLOB common ../common/*.c) add_executable(swaymsg ${sources}