aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Christoph Gysin <christoph.gysin@gmail.com>2015-12-01 21:19:43 +0200
committerLibravatar Christoph Gysin <christoph.gysin@gmail.com>2015-12-01 22:03:53 +0200
commit55b3532fe05333837de8d1041195551e724c9a40 (patch)
tree49a1e33223bc155ae7710de09079942c9bb67de8
parentcmake: remove old-style endif condition (diff)
downloadsway-55b3532fe05333837de8d1041195551e724c9a40.tar.gz
sway-55b3532fe05333837de8d1041195551e724c9a40.tar.zst
sway-55b3532fe05333837de8d1041195551e724c9a40.zip
cmake: remove unnecessary quotes
-rw-r--r--CMakeLists.txt52
-rw-r--r--swaybar/CMakeLists.txt4
-rw-r--r--swaybg/CMakeLists.txt4
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)
4 4
5set(FALLBACK_CONFIG_DIR "/etc/sway" CACHE PATH 5set(FALLBACK_CONFIG_DIR "/etc/sway" CACHE PATH
6 "Fallback config directory defaults to /etc/sway") 6 "Fallback config directory defaults to /etc/sway")
7add_definitions('-DFALLBACK_CONFIG_DIR=\"${FALLBACK_CONFIG_DIR}\"') 7add_definitions(-DFALLBACK_CONFIG_DIR=\"${FALLBACK_CONFIG_DIR}\")
8 8
9set(CMAKE_C_FLAGS "-g") 9set(CMAKE_C_FLAGS "-g")
10set(CMAKE_C_STANDARD 99) 10set(CMAKE_C_STANDARD 99)
11set(CMAKE_C_EXTENSIONS OFF) 11set(CMAKE_C_EXTENSIONS OFF)
12set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/bin") 12set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin)
13add_definitions( 13add_definitions(
14 -D_GNU_SOURCE 14 -D_GNU_SOURCE
15) 15)
@@ -18,30 +18,30 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wextra")
18set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-parameter") 18set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-parameter")
19 19
20list(INSERT CMAKE_MODULE_PATH 0 20list(INSERT CMAKE_MODULE_PATH 0
21 "${CMAKE_CURRENT_SOURCE_DIR}/CMake" 21 ${CMAKE_CURRENT_SOURCE_DIR}/CMake
22) 22)
23if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git") 23if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.git)
24 execute_process( 24 execute_process(
25 COMMAND git describe --always 25 COMMAND git describe --always
26 OUTPUT_VARIABLE GIT_COMMIT_HASH 26 OUTPUT_VARIABLE GIT_COMMIT_HASH
27 OUTPUT_STRIP_TRAILING_WHITESPACE 27 OUTPUT_STRIP_TRAILING_WHITESPACE
28 WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" 28 WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
29 ) 29 )
30 execute_process( 30 execute_process(
31 COMMAND git rev-parse --abbrev-ref HEAD 31 COMMAND git rev-parse --abbrev-ref HEAD
32 OUTPUT_VARIABLE GIT_BRANCH 32 OUTPUT_VARIABLE GIT_BRANCH
33 OUTPUT_STRIP_TRAILING_WHITESPACE 33 OUTPUT_STRIP_TRAILING_WHITESPACE
34 WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" 34 WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
35 ) 35 )
36endif() 36endif()
37 37
38add_definitions("-DSWAY_GIT_VERSION=\"g${GIT_COMMIT_HASH}\"") 38add_definitions(-DSWAY_GIT_VERSION=\"${GIT_COMMIT_HASH}\")
39add_definitions("-DSWAY_GIT_BRANCH=\"${GIT_BRANCH}\"") 39add_definitions(-DSWAY_GIT_BRANCH=\"${GIT_BRANCH}\")
40 40
41string(TIMESTAMP CURRENT_DATE "%Y-%m-%d" UTC) 41string(TIMESTAMP CURRENT_DATE "%Y-%m-%d" UTC)
42add_definitions('-DSWAY_VERSION_DATE="${CURRENT_DATE}"') 42add_definitions(-DSWAY_VERSION_DATE=\"${CURRENT_DATE}\")
43 43
44include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include") 44include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
45 45
46add_subdirectory(swaybg) 46add_subdirectory(swaybg)
47add_subdirectory(swaymsg) 47add_subdirectory(swaymsg)
@@ -60,7 +60,7 @@ file(GLOB common ${PROJECT_SOURCE_DIR}/common/*.c)
60 60
61include(Wayland) 61include(Wayland)
62WAYLAND_ADD_PROTOCOL_SERVER(proto-desktop-shell 62WAYLAND_ADD_PROTOCOL_SERVER(proto-desktop-shell
63 "${PROJECT_SOURCE_DIR}/protocols/desktop-shell.xml" 63 ${PROJECT_SOURCE_DIR}/protocols/desktop-shell.xml
64 desktop-shell 64 desktop-shell
65) 65)
66 66
@@ -93,8 +93,8 @@ install(
93 COMPONENT runtime 93 COMPONENT runtime
94) 94)
95install( 95install(
96 FILES "${CMAKE_CURRENT_SOURCE_DIR}/config" 96 FILES ${CMAKE_CURRENT_SOURCE_DIR}/config
97 DESTINATION "${FALLBACK_CONFIG_DIR}" 97 DESTINATION ${FALLBACK_CONFIG_DIR}
98 COMPONENT configuration 98 COMPONENT configuration
99) 99)
100 100
@@ -102,28 +102,28 @@ add_custom_target(man ALL)
102 102
103function(add_manpage name section) 103function(add_manpage name section)
104 add_custom_command( 104 add_custom_command(
105 OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${name}.${section}" 105 OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${name}.${section}
106 COMMAND "${A2X_COMMAND}" 106 COMMAND ${A2X_COMMAND}
107 --no-xmllint 107 --no-xmllint
108 --doctype manpage 108 --doctype manpage
109 --format manpage 109 --format manpage
110 -D "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" 110 -D ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
111 "${CMAKE_CURRENT_SOURCE_DIR}/${name}.${section}.txt" 111 ${CMAKE_CURRENT_SOURCE_DIR}/${name}.${section}.txt
112 DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/${name}.${section}.txt" 112 DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${name}.${section}.txt
113 COMMENT "Generating manpage for ${name}.${section}" 113 COMMENT Generating manpage for ${name}.${section}
114 ) 114 )
115 115
116 add_custom_target("man-${name}.${section}" 116 add_custom_target(man-${name}.${section}
117 DEPENDS 117 DEPENDS
118 "${CMAKE_CURRENT_BINARY_DIR}/${name}.${section}" 118 ${CMAKE_CURRENT_BINARY_DIR}/${name}.${section}
119 ) 119 )
120 add_dependencies(man 120 add_dependencies(man
121 "man-${name}.${section}" 121 man-${name}.${section}
122 ) 122 )
123 123
124 install( 124 install(
125 FILES "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${name}.${section}" 125 FILES ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${name}.${section}
126 DESTINATION "share/man/man${section}" 126 DESTINATION share/man/man${section}
127 COMPONENT documentation 127 COMPONENT documentation
128 ) 128 )
129endfunction() 129endfunction()
@@ -134,12 +134,12 @@ add_manpage(swaymsg 1)
134add_manpage(swaygrab 1) 134add_manpage(swaygrab 1)
135 135
136install( 136install(
137 FILES "${CMAKE_CURRENT_SOURCE_DIR}/sway.desktop" 137 FILES ${CMAKE_CURRENT_SOURCE_DIR}/sway.desktop
138 DESTINATION share/wayland-sessions 138 DESTINATION share/wayland-sessions
139 COMPONENT data 139 COMPONENT data
140) 140)
141install( 141install(
142 FILES "${CMAKE_CURRENT_SOURCE_DIR}/sway-xorg.desktop" 142 FILES ${CMAKE_CURRENT_SOURCE_DIR}/sway-xorg.desktop
143 DESTINATION share/xsessions 143 DESTINATION share/xsessions
144 COMPONENT data 144 COMPONENT data
145) 145)
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)
6 6
7include(Wayland) 7include(Wayland)
8WAYLAND_ADD_PROTOCOL_CLIENT(proto-xdg-shell 8WAYLAND_ADD_PROTOCOL_CLIENT(proto-xdg-shell
9 "${PROJECT_SOURCE_DIR}/../protocols/xdg-shell.xml" 9 ${PROJECT_SOURCE_DIR}/../protocols/xdg-shell.xml
10 xdg-shell 10 xdg-shell
11) 11)
12WAYLAND_ADD_PROTOCOL_CLIENT(proto-desktop-shell 12WAYLAND_ADD_PROTOCOL_CLIENT(proto-desktop-shell
13 "${PROJECT_SOURCE_DIR}/../protocols/desktop-shell.xml" 13 ${PROJECT_SOURCE_DIR}/../protocols/desktop-shell.xml
14 desktop-shell 14 desktop-shell
15) 15)
16 16
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)
6 6
7include(Wayland) 7include(Wayland)
8WAYLAND_ADD_PROTOCOL_CLIENT(proto-xdg-shell 8WAYLAND_ADD_PROTOCOL_CLIENT(proto-xdg-shell
9 "${PROJECT_SOURCE_DIR}/../protocols/xdg-shell.xml" 9 ${PROJECT_SOURCE_DIR}/../protocols/xdg-shell.xml
10 xdg-shell 10 xdg-shell
11) 11)
12WAYLAND_ADD_PROTOCOL_CLIENT(proto-desktop-shell 12WAYLAND_ADD_PROTOCOL_CLIENT(proto-desktop-shell
13 "${PROJECT_SOURCE_DIR}/../protocols/desktop-shell.xml" 13 ${PROJECT_SOURCE_DIR}/../protocols/desktop-shell.xml
14 desktop-shell 14 desktop-shell
15) 15)
16 16