diff options
author | Drew DeVault <sir@cmpwn.com> | 2015-11-13 07:17:22 -0500 |
---|---|---|
committer | Drew DeVault <sir@cmpwn.com> | 2015-11-13 07:17:48 -0500 |
commit | fd1a59def370be34853f3540a5e78cd82a40b7f6 (patch) | |
tree | ed5dce3cf79b27688ab81ab9d429653567b721bf /CMakeLists.txt | |
parent | Merge pull request #224 from mathstuf/cmake-cleanups (diff) | |
download | sway-fd1a59def370be34853f3540a5e78cd82a40b7f6.tar.gz sway-fd1a59def370be34853f3540a5e78cd82a40b7f6.tar.zst sway-fd1a59def370be34853f3540a5e78cd82a40b7f6.zip |
Clean up CMake stuff
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r-- | CMakeLists.txt | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index f8dd9cb7..aa103915 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
@@ -29,10 +29,9 @@ add_definitions("-DSWAY_GIT_VERSION=\"g${GIT_COMMIT_HASH}\"") | |||
29 | add_definitions("-DSWAY_GIT_BRANCH=\"${GIT_BRANCH}\"") | 29 | add_definitions("-DSWAY_GIT_BRANCH=\"${GIT_BRANCH}\"") |
30 | 30 | ||
31 | string(TIMESTAMP CURRENT_DATE "%Y-%m-%d" UTC) | 31 | string(TIMESTAMP CURRENT_DATE "%Y-%m-%d" UTC) |
32 | add_definitions("-DSWAY_VERSION_DATE=${CURRENT_DATE}") | 32 | add_definitions('-DSWAY_VERSION_DATE="${CURRENT_DATE}"') |
33 | 33 | ||
34 | include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include") | 34 | include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include") |
35 | add_subdirectory(common) | ||
36 | add_subdirectory(swaybg) | 35 | add_subdirectory(swaybg) |
37 | 36 | ||
38 | find_package(XKBCommon REQUIRED) | 37 | find_package(XKBCommon REQUIRED) |
@@ -42,6 +41,7 @@ find_package(PCRE REQUIRED) | |||
42 | find_package(JsonC REQUIRED) | 41 | find_package(JsonC REQUIRED) |
43 | 42 | ||
44 | FILE(GLOB sources ${PROJECT_SOURCE_DIR}/sway/*.c) | 43 | FILE(GLOB sources ${PROJECT_SOURCE_DIR}/sway/*.c) |
44 | FILE(GLOB common ${PROJECT_SOURCE_DIR}/common/*.c) | ||
45 | 45 | ||
46 | include_directories( | 46 | include_directories( |
47 | ${WLC_INCLUDE_DIRS} | 47 | ${WLC_INCLUDE_DIRS} |
@@ -60,7 +60,6 @@ target_link_libraries(sway | |||
60 | ${XKBCOMMON_LIBRARIES} | 60 | ${XKBCOMMON_LIBRARIES} |
61 | ${PCRE_LIBRARIES} | 61 | ${PCRE_LIBRARIES} |
62 | ${JSONC_LIBRARIES} | 62 | ${JSONC_LIBRARIES} |
63 | sway_common | ||
64 | ) | 63 | ) |
65 | 64 | ||
66 | install( | 65 | install( |
@@ -81,7 +80,7 @@ function (add_manpage name section) | |||
81 | --no-xmllint | 80 | --no-xmllint |
82 | --doctype manpage | 81 | --doctype manpage |
83 | --format manpage | 82 | --format manpage |
84 | -D "${CMAKE_CURRENT_BINARY_DIR}" | 83 | -D "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" |
85 | "${CMAKE_CURRENT_SOURCE_DIR}/${name}.${section}.txt" | 84 | "${CMAKE_CURRENT_SOURCE_DIR}/${name}.${section}.txt" |
86 | DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/${name}.${section}.txt" | 85 | DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/${name}.${section}.txt" |
87 | COMMENT "Generating manpage for ${name}.${section}") | 86 | COMMENT "Generating manpage for ${name}.${section}") |