From f7ec3d00a08f0d44ae0c8fd756c24f12d68cee9b Mon Sep 17 00:00:00 2001 From: Christoph Gysin Date: Tue, 1 Dec 2015 21:46:10 +0200 Subject: [PATCH] cmake: use tabs instead of spaces --- CMakeLists.txt | 132 ++++++++++++++++++++-------------------- swaybar/CMakeLists.txt | 44 +++++++------- swaybg/CMakeLists.txt | 44 +++++++------- swaygrab/CMakeLists.txt | 14 ++--- swaymsg/CMakeLists.txt | 12 ++-- 5 files changed, 123 insertions(+), 123 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 09cc4091..8d8c3c6a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,21 +13,21 @@ set(CMAKE_CURRENT_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/bin") set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}") add_definitions("-Wall -Wextra -Wno-unused-parameter -D_GNU_SOURCE") list(INSERT CMAKE_MODULE_PATH 0 - "${CMAKE_CURRENT_SOURCE_DIR}/CMake" + "${CMAKE_CURRENT_SOURCE_DIR}/CMake" ) if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git") - execute_process( - COMMAND git describe --always - OUTPUT_VARIABLE GIT_COMMIT_HASH - OUTPUT_STRIP_TRAILING_WHITESPACE - WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" - ) - execute_process( - COMMAND git rev-parse --abbrev-ref HEAD - OUTPUT_VARIABLE GIT_BRANCH - OUTPUT_STRIP_TRAILING_WHITESPACE - WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" - ) + execute_process( + COMMAND git describe --always + OUTPUT_VARIABLE GIT_COMMIT_HASH + OUTPUT_STRIP_TRAILING_WHITESPACE + WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" + ) + execute_process( + COMMAND git rev-parse --abbrev-ref HEAD + OUTPUT_VARIABLE GIT_BRANCH + OUTPUT_STRIP_TRAILING_WHITESPACE + WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" + ) endif(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git") add_definitions("-DSWAY_GIT_VERSION=\"g${GIT_COMMIT_HASH}\"") @@ -55,72 +55,72 @@ file(GLOB common ${PROJECT_SOURCE_DIR}/common/*.c) include(Wayland) WAYLAND_ADD_PROTOCOL_SERVER(proto-desktop-shell - "${PROJECT_SOURCE_DIR}/protocols/desktop-shell.xml" - desktop-shell + "${PROJECT_SOURCE_DIR}/protocols/desktop-shell.xml" + desktop-shell ) include_directories( - ${WLC_INCLUDE_DIRS} - ${PCRE_INCLUDE_DIRS} - ${JSONC_INCLUDE_DIRS} - ${XKBCOMMON_INCLUDE_DIRS} - ${CMAKE_CURRENT_BINARY_DIR} + ${WLC_INCLUDE_DIRS} + ${PCRE_INCLUDE_DIRS} + ${JSONC_INCLUDE_DIRS} + ${XKBCOMMON_INCLUDE_DIRS} + ${CMAKE_CURRENT_BINARY_DIR} ) add_executable(sway - ${sources} - ${common} - ${proto-desktop-shell} + ${sources} + ${common} + ${proto-desktop-shell} ) target_link_libraries(sway - ${WLC_LIBRARIES} - ${XKBCOMMON_LIBRARIES} - ${PCRE_LIBRARIES} - ${JSONC_LIBRARIES} - ${WAYLAND_SERVER_LIBRARIES} + ${WLC_LIBRARIES} + ${XKBCOMMON_LIBRARIES} + ${PCRE_LIBRARIES} + ${JSONC_LIBRARIES} + ${WAYLAND_SERVER_LIBRARIES} ) install( - TARGETS sway - RUNTIME - DESTINATION bin - COMPONENT runtime + TARGETS sway + RUNTIME + DESTINATION bin + COMPONENT runtime ) install( - FILES "${CMAKE_CURRENT_SOURCE_DIR}/config" - DESTINATION "${FALLBACK_CONFIG_DIR}" - COMPONENT configuration + FILES "${CMAKE_CURRENT_SOURCE_DIR}/config" + DESTINATION "${FALLBACK_CONFIG_DIR}" + COMPONENT configuration ) add_custom_target(man ALL) function(add_manpage name section) - add_custom_command( - OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${name}.${section}" - COMMAND "${A2X_COMMAND}" - --no-xmllint - --doctype manpage - --format manpage - -D "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" - "${CMAKE_CURRENT_SOURCE_DIR}/${name}.${section}.txt" - DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/${name}.${section}.txt" - COMMENT "Generating manpage for ${name}.${section}" - ) - - add_custom_target("man-${name}.${section}" - DEPENDS - "${CMAKE_CURRENT_BINARY_DIR}/${name}.${section}" - ) - add_dependencies(man - "man-${name}.${section}" - ) - - install( - FILES "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${name}.${section}" - DESTINATION "share/man/man${section}" - COMPONENT documentation - ) + add_custom_command( + OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${name}.${section}" + COMMAND "${A2X_COMMAND}" + --no-xmllint + --doctype manpage + --format manpage + -D "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" + "${CMAKE_CURRENT_SOURCE_DIR}/${name}.${section}.txt" + DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/${name}.${section}.txt" + COMMENT "Generating manpage for ${name}.${section}" + ) + + add_custom_target("man-${name}.${section}" + DEPENDS + "${CMAKE_CURRENT_BINARY_DIR}/${name}.${section}" + ) + add_dependencies(man + "man-${name}.${section}" + ) + + install( + FILES "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${name}.${section}" + DESTINATION "share/man/man${section}" + COMPONENT documentation + ) endfunction() add_manpage(sway 1) @@ -129,12 +129,12 @@ add_manpage(swaymsg 1) add_manpage(swaygrab 1) install( - FILES "${CMAKE_CURRENT_SOURCE_DIR}/sway.desktop" - DESTINATION share/wayland-sessions - COMPONENT data + FILES "${CMAKE_CURRENT_SOURCE_DIR}/sway.desktop" + DESTINATION share/wayland-sessions + COMPONENT data ) install( - FILES "${CMAKE_CURRENT_SOURCE_DIR}/sway-xorg.desktop" - DESTINATION share/xsessions - COMPONENT data + FILES "${CMAKE_CURRENT_SOURCE_DIR}/sway-xorg.desktop" + DESTINATION share/xsessions + COMPONENT data ) 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 ) diff --git a/swaybg/CMakeLists.txt b/swaybg/CMakeLists.txt index ae376419..9a54a32a 100644 --- a/swaybg/CMakeLists.txt +++ b/swaybg/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(swaybg - ${sources} - ${wl_sources} - ${common} - ${proto-xdg-shell} - ${proto-desktop-shell} + ${sources} + ${wl_sources} + ${common} + ${proto-xdg-shell} + ${proto-desktop-shell} ) target_link_libraries(swaybg - ${WAYLAND_CLIENT_LIBRARIES} - ${WAYLAND_CURSOR_LIBRARIES} - ${CAIRO_LIBRARIES} - ${PANGO_LIBRARIES} - m + ${WAYLAND_CLIENT_LIBRARIES} + ${WAYLAND_CURSOR_LIBRARIES} + ${CAIRO_LIBRARIES} + ${PANGO_LIBRARIES} + m ) install( - TARGETS swaybg - RUNTIME - DESTINATION bin - COMPONENT runtime + TARGETS swaybg + RUNTIME + DESTINATION bin + COMPONENT runtime ) diff --git a/swaygrab/CMakeLists.txt b/swaygrab/CMakeLists.txt index 4f480d55..672a62cd 100644 --- a/swaygrab/CMakeLists.txt +++ b/swaygrab/CMakeLists.txt @@ -6,17 +6,17 @@ file(GLOB sources ${PROJECT_SOURCE_DIR}/*.c) file(GLOB common ${PROJECT_SOURCE_DIR}/../common/*.c) add_executable(swaygrab - ${sources} - ${common} + ${sources} + ${common} ) target_link_libraries(swaygrab - rt + rt ) install( - TARGETS swaygrab - RUNTIME - DESTINATION bin - COMPONENT runtime + TARGETS swaygrab + RUNTIME + DESTINATION bin + COMPONENT runtime ) diff --git a/swaymsg/CMakeLists.txt b/swaymsg/CMakeLists.txt index 9cb93e52..9231e9f4 100644 --- a/swaymsg/CMakeLists.txt +++ b/swaymsg/CMakeLists.txt @@ -6,13 +6,13 @@ file(GLOB sources ${PROJECT_SOURCE_DIR}/*.c) file(GLOB common ${PROJECT_SOURCE_DIR}/../common/*.c) add_executable(swaymsg - ${sources} - ${common} + ${sources} + ${common} ) install( - TARGETS swaymsg - RUNTIME - DESTINATION bin - COMPONENT runtime + TARGETS swaymsg + RUNTIME + DESTINATION bin + COMPONENT runtime )