From 55b3532fe05333837de8d1041195551e724c9a40 Mon Sep 17 00:00:00 2001 From: Christoph Gysin Date: Tue, 1 Dec 2015 21:19:43 +0200 Subject: [PATCH] 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 e4c6c1df2..48f03e2e7 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 260d6701d..ea35134f1 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 e4b69c184..8016d9591 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 )