From 2429266e3ec3c541d4eec10e6f828b422d056dbd Mon Sep 17 00:00:00 2001 From: Christoph Gysin Date: Tue, 1 Dec 2015 20:35:10 +0200 Subject: cmake: convert all cmake commands to lowercase --- swaybar/CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'swaybar') diff --git a/swaybar/CMakeLists.txt b/swaybar/CMakeLists.txt index 12dd40c6..80b8876d 100644 --- a/swaybar/CMakeLists.txt +++ b/swaybar/CMakeLists.txt @@ -16,9 +16,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 ${PROJECT_SOURCE_DIR}/*.c) +file(GLOB common ${PROJECT_SOURCE_DIR}/../common/*.c) +file(GLOB wl_sources ${PROJECT_SOURCE_DIR}/../wayland/*.c) add_executable(swaybar ${sources} @@ -28,7 +28,7 @@ add_executable(swaybar ${proto-desktop-shell} ) -TARGET_LINK_LIBRARIES(swaybar ${WAYLAND_CLIENT_LIBRARIES} ${WAYLAND_CURSOR_LIBRARIES} ${CAIRO_LIBRARIES} ${PANGO_LIBRARIES} m) +target_link_libraries(swaybar ${WAYLAND_CLIENT_LIBRARIES} ${WAYLAND_CURSOR_LIBRARIES} ${CAIRO_LIBRARIES} ${PANGO_LIBRARIES} m) install( TARGETS swaybar -- cgit v1.2.3 From 905966bcae6a81fbe2cb98668982bd4804f362de Mon Sep 17 00:00:00 2001 From: Christoph Gysin Date: Tue, 1 Dec 2015 21:05:46 +0200 Subject: cmake: style consistency --- swaybar/CMakeLists.txt | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) (limited to 'swaybar') diff --git a/swaybar/CMakeLists.txt b/swaybar/CMakeLists.txt index 80b8876d..b4ce9e7b 100644 --- a/swaybar/CMakeLists.txt +++ b/swaybar/CMakeLists.txt @@ -6,8 +6,14 @@ find_package(Pango REQUIRED) include(Wayland) set(CMAKE_CURRENT_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/../bin/) -WAYLAND_ADD_PROTOCOL_CLIENT(proto-xdg-shell "${PROJECT_SOURCE_DIR}/../protocols/xdg-shell.xml" xdg-shell) -WAYLAND_ADD_PROTOCOL_CLIENT(proto-desktop-shell "${PROJECT_SOURCE_DIR}/../protocols/desktop-shell.xml" desktop-shell) +WAYLAND_ADD_PROTOCOL_CLIENT(proto-xdg-shell + "${PROJECT_SOURCE_DIR}/../protocols/xdg-shell.xml" + xdg-shell +) +WAYLAND_ADD_PROTOCOL_CLIENT(proto-desktop-shell + "${PROJECT_SOURCE_DIR}/../protocols/desktop-shell.xml" + desktop-shell +) include_directories( ${WAYLAND_CLIENT_INCLUDE_DIR} @@ -28,9 +34,17 @@ add_executable(swaybar ${proto-desktop-shell} ) -target_link_libraries(swaybar ${WAYLAND_CLIENT_LIBRARIES} ${WAYLAND_CURSOR_LIBRARIES} ${CAIRO_LIBRARIES} ${PANGO_LIBRARIES} m) +target_link_libraries(swaybar + ${WAYLAND_CLIENT_LIBRARIES} + ${WAYLAND_CURSOR_LIBRARIES} + ${CAIRO_LIBRARIES} + ${PANGO_LIBRARIES} + m +) install( - TARGETS swaybar - RUNTIME DESTINATION bin - COMPONENT runtime) + TARGETS swaybar + RUNTIME + DESTINATION bin + COMPONENT runtime +) -- cgit v1.2.3 From f7ec3d00a08f0d44ae0c8fd756c24f12d68cee9b Mon Sep 17 00:00:00 2001 From: Christoph Gysin Date: Tue, 1 Dec 2015 21:46:10 +0200 Subject: cmake: use tabs instead of spaces --- swaybar/CMakeLists.txt | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) (limited to 'swaybar') diff --git a/swaybar/CMakeLists.txt b/swaybar/CMakeLists.txt index b4ce9e7b..1b68fd3e 100644 --- a/swaybar/CMakeLists.txt +++ b/swaybar/CMakeLists.txt @@ -7,19 +7,19 @@ find_package(Pango REQUIRED) include(Wayland) set(CMAKE_CURRENT_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/../bin/) WAYLAND_ADD_PROTOCOL_CLIENT(proto-xdg-shell - "${PROJECT_SOURCE_DIR}/../protocols/xdg-shell.xml" - xdg-shell + "${PROJECT_SOURCE_DIR}/../protocols/xdg-shell.xml" + xdg-shell ) WAYLAND_ADD_PROTOCOL_CLIENT(proto-desktop-shell - "${PROJECT_SOURCE_DIR}/../protocols/desktop-shell.xml" - desktop-shell + "${PROJECT_SOURCE_DIR}/../protocols/desktop-shell.xml" + desktop-shell ) include_directories( - ${WAYLAND_CLIENT_INCLUDE_DIR} - ${CAIRO_INCLUDE_DIRS} - ${PANGO_INCLUDE_DIRS} - ${CMAKE_CURRENT_BINARY_DIR} + ${WAYLAND_CLIENT_INCLUDE_DIR} + ${CAIRO_INCLUDE_DIRS} + ${PANGO_INCLUDE_DIRS} + ${CMAKE_CURRENT_BINARY_DIR} ) file(GLOB sources ${PROJECT_SOURCE_DIR}/*.c) @@ -27,24 +27,24 @@ file(GLOB common ${PROJECT_SOURCE_DIR}/../common/*.c) file(GLOB wl_sources ${PROJECT_SOURCE_DIR}/../wayland/*.c) add_executable(swaybar - ${sources} - ${wl_sources} - ${common} - ${proto-xdg-shell} - ${proto-desktop-shell} + ${sources} + ${wl_sources} + ${common} + ${proto-xdg-shell} + ${proto-desktop-shell} ) target_link_libraries(swaybar - ${WAYLAND_CLIENT_LIBRARIES} - ${WAYLAND_CURSOR_LIBRARIES} - ${CAIRO_LIBRARIES} - ${PANGO_LIBRARIES} - m + ${WAYLAND_CLIENT_LIBRARIES} + ${WAYLAND_CURSOR_LIBRARIES} + ${CAIRO_LIBRARIES} + ${PANGO_LIBRARIES} + m ) install( - TARGETS swaybar - RUNTIME - DESTINATION bin - COMPONENT runtime + TARGETS swaybar + RUNTIME + DESTINATION bin + COMPONENT runtime ) -- cgit v1.2.3 From 2dedf206d79a3ce9c44c3216a2b148a2172b78fa Mon Sep 17 00:00:00 2001 From: Christoph Gysin Date: Tue, 1 Dec 2015 21:14:27 +0200 Subject: cmake: use out-of-source build --- swaybar/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) (limited to 'swaybar') diff --git a/swaybar/CMakeLists.txt b/swaybar/CMakeLists.txt index 1b68fd3e..260d6701 100644 --- a/swaybar/CMakeLists.txt +++ b/swaybar/CMakeLists.txt @@ -5,7 +5,6 @@ find_package(Cairo REQUIRED) find_package(Pango REQUIRED) include(Wayland) -set(CMAKE_CURRENT_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/../bin/) WAYLAND_ADD_PROTOCOL_CLIENT(proto-xdg-shell "${PROJECT_SOURCE_DIR}/../protocols/xdg-shell.xml" xdg-shell -- cgit v1.2.3 From 55b3532fe05333837de8d1041195551e724c9a40 Mon Sep 17 00:00:00 2001 From: Christoph Gysin Date: Tue, 1 Dec 2015 21:19:43 +0200 Subject: cmake: remove unnecessary quotes --- swaybar/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'swaybar') diff --git a/swaybar/CMakeLists.txt b/swaybar/CMakeLists.txt index 260d6701..ea35134f 100644 --- a/swaybar/CMakeLists.txt +++ b/swaybar/CMakeLists.txt @@ -6,11 +6,11 @@ find_package(Pango REQUIRED) include(Wayland) WAYLAND_ADD_PROTOCOL_CLIENT(proto-xdg-shell - "${PROJECT_SOURCE_DIR}/../protocols/xdg-shell.xml" + ${PROJECT_SOURCE_DIR}/../protocols/xdg-shell.xml xdg-shell ) WAYLAND_ADD_PROTOCOL_CLIENT(proto-desktop-shell - "${PROJECT_SOURCE_DIR}/../protocols/desktop-shell.xml" + ${PROJECT_SOURCE_DIR}/../protocols/desktop-shell.xml desktop-shell ) -- cgit v1.2.3