From 4277070a7b92b5aad7c08beb876f7460fe268f60 Mon Sep 17 00:00:00 2001 From: Christoph Gysin Date: Tue, 1 Dec 2015 22:22:39 +0200 Subject: cmake: extract add_manpage() --- CMakeLists.txt | 32 +------------------------------- 1 file changed, 1 insertion(+), 31 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 48f03e2e..4d828153 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -50,7 +50,6 @@ add_subdirectory(swaybar) find_package(XKBCommon REQUIRED) find_package(WLC REQUIRED) -find_package(A2X REQUIRED) find_package(PCRE REQUIRED) find_package(Wayland REQUIRED) find_package(JsonC REQUIRED) @@ -98,36 +97,7 @@ install( COMPONENT configuration ) -add_custom_target(man ALL) - -function(add_manpage name section) - add_custom_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} - ) - - add_custom_target(man-${name}.${section} - DEPENDS - ${CMAKE_CURRENT_BINARY_DIR}/${name}.${section} - ) - add_dependencies(man - man-${name}.${section} - ) - - install( - FILES ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${name}.${section} - DESTINATION share/man/man${section} - COMPONENT documentation - ) -endfunction() - +include(Manpage) add_manpage(sway 1) add_manpage(sway 5) add_manpage(swaymsg 1) -- cgit v1.2.3-54-g00ecf From 92a353838172c1a6d73a6ee092b346b2f14ca7cc Mon Sep 17 00:00:00 2001 From: Christoph Gysin Date: Tue, 1 Dec 2015 22:25:22 +0200 Subject: cmake: extract sway --- CMakeLists.txt | 50 +------------------------------------------------- sway/CMakeLists.txt | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 49 deletions(-) create mode 100644 sway/CMakeLists.txt (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 4d828153..dcb52c0d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -43,60 +43,12 @@ add_definitions(-DSWAY_VERSION_DATE=\"${CURRENT_DATE}\") include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include) +add_subdirectory(sway) add_subdirectory(swaybg) add_subdirectory(swaymsg) add_subdirectory(swaygrab) add_subdirectory(swaybar) -find_package(XKBCommon REQUIRED) -find_package(WLC REQUIRED) -find_package(PCRE REQUIRED) -find_package(Wayland REQUIRED) -find_package(JsonC REQUIRED) - -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 -) - -include_directories( - ${WLC_INCLUDE_DIRS} - ${PCRE_INCLUDE_DIRS} - ${JSONC_INCLUDE_DIRS} - ${XKBCOMMON_INCLUDE_DIRS} - ${CMAKE_CURRENT_BINARY_DIR} -) - -add_executable(sway - ${sources} - ${common} - ${proto-desktop-shell} -) - -target_link_libraries(sway - ${WLC_LIBRARIES} - ${XKBCOMMON_LIBRARIES} - ${PCRE_LIBRARIES} - ${JSONC_LIBRARIES} - ${WAYLAND_SERVER_LIBRARIES} -) - -install( - TARGETS sway - RUNTIME - DESTINATION bin - COMPONENT runtime -) -install( - FILES ${CMAKE_CURRENT_SOURCE_DIR}/config - DESTINATION ${FALLBACK_CONFIG_DIR} - COMPONENT configuration -) - include(Manpage) add_manpage(sway 1) add_manpage(sway 5) diff --git a/sway/CMakeLists.txt b/sway/CMakeLists.txt new file mode 100644 index 00000000..1e2f3fd3 --- /dev/null +++ b/sway/CMakeLists.txt @@ -0,0 +1,48 @@ +find_package(XKBCommon REQUIRED) +find_package(WLC REQUIRED) +find_package(PCRE REQUIRED) +find_package(Wayland REQUIRED) +find_package(JsonC REQUIRED) + +include(Wayland) +WAYLAND_ADD_PROTOCOL_SERVER(proto-desktop-shell + ${PROJECT_SOURCE_DIR}/protocols/desktop-shell.xml + desktop-shell +) + +file(GLOB sources ${PROJECT_SOURCE_DIR}/sway/*.c) +file(GLOB common ${PROJECT_SOURCE_DIR}/common/*.c) + +include_directories( + ${WLC_INCLUDE_DIRS} + ${PCRE_INCLUDE_DIRS} + ${JSONC_INCLUDE_DIRS} + ${XKBCOMMON_INCLUDE_DIRS} + ${CMAKE_CURRENT_BINARY_DIR} +) + +add_executable(sway + ${sources} + ${common} + ${proto-desktop-shell} +) + +target_link_libraries(sway + ${WLC_LIBRARIES} + ${XKBCOMMON_LIBRARIES} + ${PCRE_LIBRARIES} + ${JSONC_LIBRARIES} + ${WAYLAND_SERVER_LIBRARIES} +) + +install( + TARGETS sway + RUNTIME + DESTINATION bin + COMPONENT runtime +) +install( + FILES ${CMAKE_CURRENT_SOURCE_DIR}/config + DESTINATION ${FALLBACK_CONFIG_DIR} + COMPONENT configuration +) -- cgit v1.2.3-54-g00ecf From 38d4ee9f5030ad8bf383c8c24b0b13b20dbc45de Mon Sep 17 00:00:00 2001 From: Christoph Gysin Date: Tue, 1 Dec 2015 22:45:20 +0200 Subject: cmake: remove extra space --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index dcb52c0d..b9a2e37d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,7 +28,7 @@ if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.git) WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} ) execute_process( - COMMAND git rev-parse --abbrev-ref HEAD + COMMAND git rev-parse --abbrev-ref HEAD OUTPUT_VARIABLE GIT_BRANCH OUTPUT_STRIP_TRAILING_WHITESPACE WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} -- cgit v1.2.3-54-g00ecf