itycodes
/
convince
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cmake: style consistency

Browse Source
master
Christoph Gysin 9 years ago
parent 2429266e3e
commit 905966bcae
5 changed files with 90 additions and 44 deletions
Show Stats Download Patch File Download Diff File

40
CMakeLists.txt
Unescape View File

@ -13,8 +13,8 @@ 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}")
add_definitions("-Wall -Wextra -Wno-unused-parameter -D_GNU_SOURCE") add_definitions("-Wall -Wextra -Wno-unused-parameter -D_GNU_SOURCE")
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
@ -54,7 +54,10 @@ file(GLOB sources ${PROJECT_SOURCE_DIR}/sway/*.c)
file(GLOB common ${PROJECT_SOURCE_DIR}/common/*.c) file(GLOB common ${PROJECT_SOURCE_DIR}/common/*.c)
include(Wayland) 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( include_directories(
${WLC_INCLUDE_DIRS} ${WLC_INCLUDE_DIRS}
@ -80,16 +83,19 @@ target_link_libraries(sway
install( install(
TARGETS sway TARGETS sway
RUNTIME DESTINATION bin RUNTIME
COMPONENT runtime) DESTINATION bin
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
)
add_custom_target(man ALL) 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}"
@ -99,19 +105,23 @@ function (add_manpage name section)
-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()
add_manpage(sway 1) add_manpage(sway 1)
add_manpage(sway 5) add_manpage(sway 5)
@ -121,8 +131,10 @@ 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
)

24
swaybar/CMakeLists.txt
Unescape View File

@ -6,8 +6,14 @@ find_package(Pango REQUIRED)
include(Wayland) include(Wayland)
set(CMAKE_CURRENT_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/../bin/) 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-xdg-shell
WAYLAND_ADD_PROTOCOL_CLIENT(proto-desktop-shell "${PROJECT_SOURCE_DIR}/../protocols/desktop-shell.xml" desktop-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( include_directories(
${WAYLAND_CLIENT_INCLUDE_DIR} ${WAYLAND_CLIENT_INCLUDE_DIR}
@ -28,9 +34,17 @@ add_executable(swaybar
${proto-desktop-shell} ${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( install(
TARGETS swaybar TARGETS swaybar
RUNTIME DESTINATION bin RUNTIME
COMPONENT runtime) DESTINATION bin
COMPONENT runtime
)

24
swaybg/CMakeLists.txt
Unescape View File

@ -6,8 +6,14 @@ find_package(Pango REQUIRED)
include(Wayland) include(Wayland)
set(CMAKE_CURRENT_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/../bin/) 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-xdg-shell
WAYLAND_ADD_PROTOCOL_CLIENT(proto-desktop-shell "${PROJECT_SOURCE_DIR}/../protocols/desktop-shell.xml" desktop-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( include_directories(
${WAYLAND_CLIENT_INCLUDE_DIR} ${WAYLAND_CLIENT_INCLUDE_DIR}
@ -28,9 +34,17 @@ add_executable(swaybg
${proto-desktop-shell} ${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( install(
TARGETS swaybg TARGETS swaybg
RUNTIME DESTINATION bin RUNTIME
COMPONENT runtime) DESTINATION bin
COMPONENT runtime
)

10
swaygrab/CMakeLists.txt
Unescape View File

@ -10,9 +10,13 @@ add_executable(swaygrab
${common} ${common}
) )
target_link_libraries(swaygrab rt) target_link_libraries(swaygrab
rt
)
install( install(
TARGETS swaygrab TARGETS swaygrab
RUNTIME DESTINATION bin RUNTIME
COMPONENT runtime) DESTINATION bin
COMPONENT runtime
)

6
swaymsg/CMakeLists.txt
Unescape View File

@ -12,5 +12,7 @@ add_executable(swaymsg
install( install(
TARGETS swaymsg TARGETS swaymsg
RUNTIME DESTINATION bin RUNTIME
COMPONENT runtime) DESTINATION bin
COMPONENT runtime
)

Write Preview
Loading…
Cancel
Save