mirrors
/
sway
mirror of https://github.com/swaywm/sway.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Clean up CMake stuff

This commit is contained in:
Drew DeVault 2015-11-13 07:17:22 -05:00
parent 44d0b3282f
commit fd1a59def3
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@ -29,10 +29,9 @@ add_definitions("-DSWAY_GIT_VERSION=\"g${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(common)
add_subdirectory(swaybg) add_subdirectory(swaybg)
find_package(XKBCommon REQUIRED) find_package(XKBCommon REQUIRED)
@ -42,6 +41,7 @@ find_package(PCRE REQUIRED)
find_package(JsonC REQUIRED) find_package(JsonC REQUIRED)
FILE(GLOB sources ${PROJECT_SOURCE_DIR}/sway/*.c) FILE(GLOB sources ${PROJECT_SOURCE_DIR}/sway/*.c)
FILE(GLOB common ${PROJECT_SOURCE_DIR}/common/*.c)
include_directories( include_directories(
${WLC_INCLUDE_DIRS} ${WLC_INCLUDE_DIRS}
@ -60,7 +60,6 @@ target_link_libraries(sway
${XKBCOMMON_LIBRARIES} ${XKBCOMMON_LIBRARIES}
${PCRE_LIBRARIES} ${PCRE_LIBRARIES}
${JSONC_LIBRARIES} ${JSONC_LIBRARIES}
sway_common
) )
install( install(
@ -81,7 +80,7 @@ function (add_manpage name section)
--no-xmllint --no-xmllint
--doctype manpage --doctype manpage
--format manpage --format manpage
-D "${CMAKE_CURRENT_BINARY_DIR}" -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}")

3
common/CMakeLists.txt
View File

@ -1,3 +0,0 @@
add_library(sway_common STATIC
list.c
log.c)

3
swaybg/CMakeLists.txt
View File

@ -14,6 +14,7 @@ include_directories(
) )
FILE(GLOB sources ${PROJECT_SOURCE_DIR}/*.c) FILE(GLOB sources ${PROJECT_SOURCE_DIR}/*.c)
FILE(GLOB common ${PROJECT_SOURCE_DIR}/../common/*.c)
FILE(GLOB wl_sources ${PROJECT_SOURCE_DIR}/../wayland/*.c) FILE(GLOB wl_sources ${PROJECT_SOURCE_DIR}/../wayland/*.c)
add_executable(swaybg add_executable(swaybg
@ -22,7 +23,7 @@ add_executable(swaybg
${common} ${common}
) )
TARGET_LINK_LIBRARIES(swaybg ${WAYLAND_CLIENT_LIBRARIES} ${CAIRO_LIBRARIES} ${PANGO_LIBRARIES} sway_common) TARGET_LINK_LIBRARIES(swaybg ${WAYLAND_CLIENT_LIBRARIES} ${CAIRO_LIBRARIES} ${PANGO_LIBRARIES})
install( install(
TARGETS swaybg TARGETS swaybg