mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-11-03 09:01:43 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

cmake: remove unnecessary quotes

Browse source
This commit is contained in:
Christoph Gysin 2015-12-01 21:19:43 +02:00
parent 8f00eac07b
commit 55b3532fe0
3 changed files with 30 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

52
CMakeLists.txt
View file

@ -4,12 +4,12 @@ project(sway C)
set(FALLBACK_CONFIG_DIR "/etc/sway" CACHE PATH set(FALLBACK_CONFIG_DIR "/etc/sway" CACHE PATH
"Fallback config directory defaults to /etc/sway") "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_FLAGS "-g")
set(CMAKE_C_STANDARD 99) set(CMAKE_C_STANDARD 99)
set(CMAKE_C_EXTENSIONS OFF) 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( add_definitions(
-D_GNU_SOURCE -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") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-parameter")
list(INSERT CMAKE_MODULE_PATH 0 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( execute_process(
COMMAND git describe --always COMMAND git describe --always
OUTPUT_VARIABLE GIT_COMMIT_HASH OUTPUT_VARIABLE GIT_COMMIT_HASH
OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_STRIP_TRAILING_WHITESPACE
WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
) )
execute_process( execute_process(
COMMAND git rev-parse --abbrev-ref HEAD COMMAND git rev-parse --abbrev-ref HEAD
OUTPUT_VARIABLE GIT_BRANCH OUTPUT_VARIABLE GIT_BRANCH
OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_STRIP_TRAILING_WHITESPACE
WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
) )
endif() endif()
add_definitions("-DSWAY_GIT_VERSION=\"g${GIT_COMMIT_HASH}\"") add_definitions(-DSWAY_GIT_VERSION=\"${GIT_COMMIT_HASH}\")
add_definitions("-DSWAY_GIT_BRANCH=\"${GIT_BRANCH}\"") add_definitions(-DSWAY_GIT_BRANCH=\"${GIT_BRANCH}\")
string(TIMESTAMP CURRENT_DATE "%Y-%m-%d" UTC) 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(swaybg)
add_subdirectory(swaymsg) add_subdirectory(swaymsg)
@ -60,7 +60,7 @@ file(GLOB common ${PROJECT_SOURCE_DIR}/common/*.c)
include(Wayland) include(Wayland)
WAYLAND_ADD_PROTOCOL_SERVER(proto-desktop-shell WAYLAND_ADD_PROTOCOL_SERVER(proto-desktop-shell
"${PROJECT_SOURCE_DIR}/protocols/desktop-shell.xml" ${PROJECT_SOURCE_DIR}/protocols/desktop-shell.xml
desktop-shell desktop-shell
) )
@ -93,8 +93,8 @@ install(
COMPONENT runtime COMPONENT runtime
) )
install( install(
FILES "${CMAKE_CURRENT_SOURCE_DIR}/config" FILES ${CMAKE_CURRENT_SOURCE_DIR}/config
DESTINATION "${FALLBACK_CONFIG_DIR}" DESTINATION ${FALLBACK_CONFIG_DIR}
COMPONENT configuration COMPONENT configuration
) )
@ -102,28 +102,28 @@ add_custom_target(man ALL)
function(add_manpage name section) function(add_manpage name section)
add_custom_command( add_custom_command(
OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${name}.${section}" OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${name}.${section}
COMMAND "${A2X_COMMAND}" COMMAND ${A2X_COMMAND}
--no-xmllint --no-xmllint
--doctype manpage --doctype manpage
--format manpage --format manpage
-D "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" -D ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
"${CMAKE_CURRENT_SOURCE_DIR}/${name}.${section}.txt" ${CMAKE_CURRENT_SOURCE_DIR}/${name}.${section}.txt
DEPENDS "${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}" add_custom_target(man-${name}.${section}
DEPENDS DEPENDS
"${CMAKE_CURRENT_BINARY_DIR}/${name}.${section}" ${CMAKE_CURRENT_BINARY_DIR}/${name}.${section}
) )
add_dependencies(man add_dependencies(man
"man-${name}.${section}" man-${name}.${section}
) )
install( install(
FILES "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${name}.${section}" FILES ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${name}.${section}
DESTINATION "share/man/man${section}" DESTINATION share/man/man${section}
COMPONENT documentation COMPONENT documentation
) )
endfunction() endfunction()
@ -134,12 +134,12 @@ add_manpage(swaymsg 1)
add_manpage(swaygrab 1) add_manpage(swaygrab 1)
install( install(
FILES "${CMAKE_CURRENT_SOURCE_DIR}/sway.desktop" FILES ${CMAKE_CURRENT_SOURCE_DIR}/sway.desktop
DESTINATION share/wayland-sessions DESTINATION share/wayland-sessions
COMPONENT data COMPONENT data
) )
install( install(
FILES "${CMAKE_CURRENT_SOURCE_DIR}/sway-xorg.desktop" FILES ${CMAKE_CURRENT_SOURCE_DIR}/sway-xorg.desktop
DESTINATION share/xsessions DESTINATION share/xsessions
COMPONENT data COMPONENT data
) )

4
swaybar/CMakeLists.txt
View file

@ -6,11 +6,11 @@ find_package(Pango REQUIRED)
include(Wayland) include(Wayland)
WAYLAND_ADD_PROTOCOL_CLIENT(proto-xdg-shell WAYLAND_ADD_PROTOCOL_CLIENT(proto-xdg-shell
"${PROJECT_SOURCE_DIR}/../protocols/xdg-shell.xml" ${PROJECT_SOURCE_DIR}/../protocols/xdg-shell.xml
xdg-shell xdg-shell
) )
WAYLAND_ADD_PROTOCOL_CLIENT(proto-desktop-shell WAYLAND_ADD_PROTOCOL_CLIENT(proto-desktop-shell
"${PROJECT_SOURCE_DIR}/../protocols/desktop-shell.xml" ${PROJECT_SOURCE_DIR}/../protocols/desktop-shell.xml
desktop-shell desktop-shell
) )

4
swaybg/CMakeLists.txt
View file

@ -6,11 +6,11 @@ find_package(Pango REQUIRED)
include(Wayland) include(Wayland)
WAYLAND_ADD_PROTOCOL_CLIENT(proto-xdg-shell WAYLAND_ADD_PROTOCOL_CLIENT(proto-xdg-shell
"${PROJECT_SOURCE_DIR}/../protocols/xdg-shell.xml" ${PROJECT_SOURCE_DIR}/../protocols/xdg-shell.xml
xdg-shell xdg-shell
) )
WAYLAND_ADD_PROTOCOL_CLIENT(proto-desktop-shell WAYLAND_ADD_PROTOCOL_CLIENT(proto-desktop-shell
"${PROJECT_SOURCE_DIR}/../protocols/desktop-shell.xml" ${PROJECT_SOURCE_DIR}/../protocols/desktop-shell.xml
desktop-shell desktop-shell
) )