From 2429266e3ec3c541d4eec10e6f828b422d056dbd Mon Sep 17 00:00:00 2001 From: Christoph Gysin Date: Tue, 1 Dec 2015 20:35:10 +0200 Subject: [PATCH 1/7] cmake: convert all cmake commands to lowercase --- CMakeLists.txt | 6 +++--- swaybar/CMakeLists.txt | 8 ++++---- swaybg/CMakeLists.txt | 8 ++++---- swaygrab/CMakeLists.txt | 6 +++--- swaymsg/CMakeLists.txt | 4 ++-- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 68dd7fa3..c022d87d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,7 @@ add_definitions('-DFALLBACK_CONFIG_DIR=\"${FALLBACK_CONFIG_DIR}\"') set(CMAKE_C_FLAGS "-g") set(CMAKE_C_STANDARD 99) -SET(CMAKE_C_EXTENSIONS OFF) +set(CMAKE_C_EXTENSIONS OFF) 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") @@ -50,8 +50,8 @@ find_package(PCRE REQUIRED) find_package(Wayland REQUIRED) find_package(JsonC REQUIRED) -FILE(GLOB sources ${PROJECT_SOURCE_DIR}/sway/*.c) -FILE(GLOB common ${PROJECT_SOURCE_DIR}/common/*.c) +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) 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 diff --git a/swaybg/CMakeLists.txt b/swaybg/CMakeLists.txt index d4de69de..6a6c3efa 100644 --- a/swaybg/CMakeLists.txt +++ b/swaybg/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(swaybg ${sources} @@ -28,7 +28,7 @@ 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 diff --git a/swaygrab/CMakeLists.txt b/swaygrab/CMakeLists.txt index 8bc8ed8b..3901d91c 100644 --- a/swaygrab/CMakeLists.txt +++ b/swaygrab/CMakeLists.txt @@ -2,15 +2,15 @@ project(swaygrab) set(CMAKE_CURRENT_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/../bin/) -FILE(GLOB sources ${PROJECT_SOURCE_DIR}/*.c) -FILE(GLOB common ${PROJECT_SOURCE_DIR}/../common/*.c) +file(GLOB sources ${PROJECT_SOURCE_DIR}/*.c) +file(GLOB common ${PROJECT_SOURCE_DIR}/../common/*.c) add_executable(swaygrab ${sources} ${common} ) -TARGET_LINK_LIBRARIES(swaygrab rt) +target_link_libraries(swaygrab rt) install( TARGETS swaygrab diff --git a/swaymsg/CMakeLists.txt b/swaymsg/CMakeLists.txt index 79af0f3e..2dcdfede 100644 --- a/swaymsg/CMakeLists.txt +++ b/swaymsg/CMakeLists.txt @@ -2,8 +2,8 @@ project(swaymsg) set(CMAKE_CURRENT_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/../bin/) -FILE(GLOB sources ${PROJECT_SOURCE_DIR}/*.c) -FILE(GLOB common ${PROJECT_SOURCE_DIR}/../common/*.c) +file(GLOB sources ${PROJECT_SOURCE_DIR}/*.c) +file(GLOB common ${PROJECT_SOURCE_DIR}/../common/*.c) add_executable(swaymsg ${sources} From 905966bcae6a81fbe2cb98668982bd4804f362de Mon Sep 17 00:00:00 2001 From: Christoph Gysin Date: Tue, 1 Dec 2015 21:05:46 +0200 Subject: [PATCH 2/7] 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 c022d87d..09cc4091 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 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 +) diff --git a/swaybg/CMakeLists.txt b/swaybg/CMakeLists.txt index 6a6c3efa..ae376419 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 3901d91c..4f480d55 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 2dcdfede..9cb93e52 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 +) From f7ec3d00a08f0d44ae0c8fd756c24f12d68cee9b Mon Sep 17 00:00:00 2001 From: Christoph Gysin Date: Tue, 1 Dec 2015 21:46:10 +0200 Subject: [PATCH 3/7] 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 ) From a043c9030ca974b7f4514d1158ffe926458f7732 Mon Sep 17 00:00:00 2001 From: Christoph Gysin Date: Tue, 1 Dec 2015 21:07:06 +0200 Subject: [PATCH 4/7] cmake: separate C flags and preprocesser definitions --- CMakeLists.txt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8d8c3c6a..51209aea 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,7 +11,13 @@ set(CMAKE_C_STANDARD 99) set(CMAKE_C_EXTENSIONS OFF) 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") +add_definitions( + -D_GNU_SOURCE +) +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall") +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wextra") +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-parameter") + list(INSERT CMAKE_MODULE_PATH 0 "${CMAKE_CURRENT_SOURCE_DIR}/CMake" ) From 2dedf206d79a3ce9c44c3216a2b148a2172b78fa Mon Sep 17 00:00:00 2001 From: Christoph Gysin Date: Tue, 1 Dec 2015 21:14:27 +0200 Subject: [PATCH 5/7] cmake: use out-of-source build --- CMakeLists.txt | 3 +-- README.md | 4 +++- swaybar/CMakeLists.txt | 1 - swaybg/CMakeLists.txt | 1 - swaygrab/CMakeLists.txt | 2 -- swaymsg/CMakeLists.txt | 2 -- 6 files changed, 4 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 51209aea..9aeea48e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,8 +9,7 @@ add_definitions('-DFALLBACK_CONFIG_DIR=\"${FALLBACK_CONFIG_DIR}\"') set(CMAKE_C_FLAGS "-g") set(CMAKE_C_STANDARD 99) set(CMAKE_C_EXTENSIONS OFF) -set(CMAKE_CURRENT_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/bin") -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}") +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/bin") add_definitions( -D_GNU_SOURCE ) diff --git a/README.md b/README.md index 4bbfa750..394dfc80 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,9 @@ Install dependencies: Run these commands: - cmake . + mkdir build + cd build + cmake .. make sudo make install 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 diff --git a/swaybg/CMakeLists.txt b/swaybg/CMakeLists.txt index 9a54a32a..e4b69c18 100644 --- a/swaybg/CMakeLists.txt +++ b/swaybg/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 diff --git a/swaygrab/CMakeLists.txt b/swaygrab/CMakeLists.txt index 672a62cd..efe8986b 100644 --- a/swaygrab/CMakeLists.txt +++ b/swaygrab/CMakeLists.txt @@ -1,7 +1,5 @@ project(swaygrab) -set(CMAKE_CURRENT_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/../bin/) - file(GLOB sources ${PROJECT_SOURCE_DIR}/*.c) file(GLOB common ${PROJECT_SOURCE_DIR}/../common/*.c) diff --git a/swaymsg/CMakeLists.txt b/swaymsg/CMakeLists.txt index 9231e9f4..2671dc2c 100644 --- a/swaymsg/CMakeLists.txt +++ b/swaymsg/CMakeLists.txt @@ -1,7 +1,5 @@ project(swaymsg) -set(CMAKE_CURRENT_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/../bin/) - file(GLOB sources ${PROJECT_SOURCE_DIR}/*.c) file(GLOB common ${PROJECT_SOURCE_DIR}/../common/*.c) From 8f00eac07b78bc6cc76f071e869b6fc3255290f4 Mon Sep 17 00:00:00 2001 From: Christoph Gysin Date: Tue, 1 Dec 2015 21:17:31 +0200 Subject: [PATCH 6/7] cmake: remove old-style endif condition --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9aeea48e..e4c6c1df 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,7 +33,7 @@ if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git") OUTPUT_STRIP_TRAILING_WHITESPACE WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" ) -endif(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git") +endif() add_definitions("-DSWAY_GIT_VERSION=\"g${GIT_COMMIT_HASH}\"") add_definitions("-DSWAY_GIT_BRANCH=\"${GIT_BRANCH}\"") From 55b3532fe05333837de8d1041195551e724c9a40 Mon Sep 17 00:00:00 2001 From: Christoph Gysin Date: Tue, 1 Dec 2015 21:19:43 +0200 Subject: [PATCH 7/7] cmake: remove unnecessary quotes --- CMakeLists.txt | 52 +++++++++++++++++++++--------------------- swaybar/CMakeLists.txt | 4 ++-- swaybg/CMakeLists.txt | 4 ++-- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e4c6c1df..48f03e2e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,12 +4,12 @@ project(sway C) set(FALLBACK_CONFIG_DIR "/etc/sway" CACHE PATH "Fallback config directory defaults to /etc/sway") -add_definitions('-DFALLBACK_CONFIG_DIR=\"${FALLBACK_CONFIG_DIR}\"') +add_definitions(-DFALLBACK_CONFIG_DIR=\"${FALLBACK_CONFIG_DIR}\") set(CMAKE_C_FLAGS "-g") set(CMAKE_C_STANDARD 99) set(CMAKE_C_EXTENSIONS OFF) -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/bin") +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin) add_definitions( -D_GNU_SOURCE ) @@ -18,30 +18,30 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wextra") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-parameter") list(INSERT CMAKE_MODULE_PATH 0 - "${CMAKE_CURRENT_SOURCE_DIR}/CMake" + ${CMAKE_CURRENT_SOURCE_DIR}/CMake ) -if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git") +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}" + 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}" + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} ) endif() -add_definitions("-DSWAY_GIT_VERSION=\"g${GIT_COMMIT_HASH}\"") -add_definitions("-DSWAY_GIT_BRANCH=\"${GIT_BRANCH}\"") +add_definitions(-DSWAY_GIT_VERSION=\"${GIT_COMMIT_HASH}\") +add_definitions(-DSWAY_GIT_BRANCH=\"${GIT_BRANCH}\") string(TIMESTAMP CURRENT_DATE "%Y-%m-%d" UTC) -add_definitions('-DSWAY_VERSION_DATE="${CURRENT_DATE}"') +add_definitions(-DSWAY_VERSION_DATE=\"${CURRENT_DATE}\") -include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include") +include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include) add_subdirectory(swaybg) add_subdirectory(swaymsg) @@ -60,7 +60,7 @@ file(GLOB common ${PROJECT_SOURCE_DIR}/common/*.c) include(Wayland) WAYLAND_ADD_PROTOCOL_SERVER(proto-desktop-shell - "${PROJECT_SOURCE_DIR}/protocols/desktop-shell.xml" + ${PROJECT_SOURCE_DIR}/protocols/desktop-shell.xml desktop-shell ) @@ -93,8 +93,8 @@ install( COMPONENT runtime ) install( - FILES "${CMAKE_CURRENT_SOURCE_DIR}/config" - DESTINATION "${FALLBACK_CONFIG_DIR}" + FILES ${CMAKE_CURRENT_SOURCE_DIR}/config + DESTINATION ${FALLBACK_CONFIG_DIR} COMPONENT configuration ) @@ -102,28 +102,28 @@ add_custom_target(man ALL) function(add_manpage name section) add_custom_command( - OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${name}.${section}" - COMMAND "${A2X_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}" + -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}" + 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}" + FILES ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${name}.${section} + DESTINATION share/man/man${section} COMPONENT documentation ) endfunction() @@ -134,12 +134,12 @@ add_manpage(swaymsg 1) add_manpage(swaygrab 1) install( - FILES "${CMAKE_CURRENT_SOURCE_DIR}/sway.desktop" + FILES ${CMAKE_CURRENT_SOURCE_DIR}/sway.desktop DESTINATION share/wayland-sessions COMPONENT data ) install( - FILES "${CMAKE_CURRENT_SOURCE_DIR}/sway-xorg.desktop" + FILES ${CMAKE_CURRENT_SOURCE_DIR}/sway-xorg.desktop DESTINATION share/xsessions COMPONENT data ) 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 ) diff --git a/swaybg/CMakeLists.txt b/swaybg/CMakeLists.txt index e4b69c18..8016d959 100644 --- a/swaybg/CMakeLists.txt +++ b/swaybg/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 )