From 905966bcae6a81fbe2cb98668982bd4804f362de Mon Sep 17 00:00:00 2001 From: Christoph Gysin Date: Tue, 1 Dec 2015 21:05:46 +0200 Subject: [PATCH] cmake: style consistency --- CMakeLists.txt | 62 ++++++++++++++++++++++++----------------- swaybar/CMakeLists.txt | 26 +++++++++++++---- swaybg/CMakeLists.txt | 26 +++++++++++++---- swaygrab/CMakeLists.txt | 12 +++++--- swaymsg/CMakeLists.txt | 8 ++++-- 5 files changed, 90 insertions(+), 44 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c022d87d8..09cc40914 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,8 +13,8 @@ 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 @@ -54,14 +54,17 @@ file(GLOB sources ${PROJECT_SOURCE_DIR}/sway/*.c) 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) +WAYLAND_ADD_PROTOCOL_SERVER(proto-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 @@ -71,25 +74,28 @@ add_executable(sway ) 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) + COMPONENT configuration +) add_custom_target(man ALL) -function (add_manpage name section) +function(add_manpage name section) add_custom_command( OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${name}.${section}" COMMAND "${A2X_COMMAND}" @@ -99,19 +105,23 @@ function (add_manpage name section) -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}") + COMMENT "Generating manpage for ${name}.${section}" + ) add_custom_target("man-${name}.${section}" DEPENDS - "${CMAKE_CURRENT_BINARY_DIR}/${name}.${section}") + "${CMAKE_CURRENT_BINARY_DIR}/${name}.${section}" + ) add_dependencies(man - "man-${name}.${section}") + "man-${name}.${section}" + ) install( FILES "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${name}.${section}" DESTINATION "share/man/man${section}" - COMPONENT documentation) -endfunction () + COMPONENT documentation + ) +endfunction() add_manpage(sway 1) add_manpage(sway 5) @@ -121,8 +131,10 @@ add_manpage(swaygrab 1) install( FILES "${CMAKE_CURRENT_SOURCE_DIR}/sway.desktop" DESTINATION share/wayland-sessions - COMPONENT data) + COMPONENT data +) install( FILES "${CMAKE_CURRENT_SOURCE_DIR}/sway-xorg.desktop" DESTINATION share/xsessions - COMPONENT data) + COMPONENT data +) diff --git a/swaybar/CMakeLists.txt b/swaybar/CMakeLists.txt index 80b8876da..b4ce9e7b2 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 +) diff --git a/swaybg/CMakeLists.txt b/swaybg/CMakeLists.txt index 6a6c3efad..ae376419e 100644 --- a/swaybg/CMakeLists.txt +++ b/swaybg/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(swaybg ${proto-desktop-shell} ) -target_link_libraries(swaybg ${WAYLAND_CLIENT_LIBRARIES} ${WAYLAND_CURSOR_LIBRARIES} ${CAIRO_LIBRARIES} ${PANGO_LIBRARIES} m) +target_link_libraries(swaybg + ${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 3901d91cb..4f480d55a 100644 --- a/swaygrab/CMakeLists.txt +++ b/swaygrab/CMakeLists.txt @@ -10,9 +10,13 @@ add_executable(swaygrab ${common} ) -target_link_libraries(swaygrab rt) +target_link_libraries(swaygrab + 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 2dcdfede7..9cb93e525 100644 --- a/swaymsg/CMakeLists.txt +++ b/swaymsg/CMakeLists.txt @@ -11,6 +11,8 @@ add_executable(swaymsg ) install( - TARGETS swaymsg - RUNTIME DESTINATION bin - COMPONENT runtime) + TARGETS swaymsg + RUNTIME + DESTINATION bin + COMPONENT runtime +)