cmake: style consistency
This commit is contained in:
parent
2429266e3e
commit
905966bcae
|
@ -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,7 +54,10 @@ 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}
|
||||
|
@ -80,16 +83,19 @@ target_link_libraries(sway
|
|||
|
||||
install(
|
||||
TARGETS sway
|
||||
RUNTIME DESTINATION bin
|
||||
COMPONENT runtime)
|
||||
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
|
||||
)
|
||||
|
|
|
@ -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)
|
||||
RUNTIME
|
||||
DESTINATION bin
|
||||
COMPONENT runtime
|
||||
)
|
||||
|
|
|
@ -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)
|
||||
RUNTIME
|
||||
DESTINATION bin
|
||||
COMPONENT runtime
|
||||
)
|
||||
|
|
|
@ -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)
|
||||
RUNTIME
|
||||
DESTINATION bin
|
||||
COMPONENT runtime
|
||||
)
|
||||
|
|
|
@ -12,5 +12,7 @@ add_executable(swaymsg
|
|||
|
||||
install(
|
||||
TARGETS swaymsg
|
||||
RUNTIME DESTINATION bin
|
||||
COMPONENT runtime)
|
||||
RUNTIME
|
||||
DESTINATION bin
|
||||
COMPONENT runtime
|
||||
)
|
||||
|
|
Loading…
Reference in a new issue