diff options
author | Drew DeVault <sir@cmpwn.com> | 2015-09-30 08:30:43 -0400 |
---|---|---|
committer | Drew DeVault <sir@cmpwn.com> | 2015-09-30 08:30:43 -0400 |
commit | 3ca1fa78447ef88f2c438b7f0edbca2e2dde3557 (patch) | |
tree | bc3f7f2aa1a0b3350d37397d17444564fb8ca5b0 | |
parent | return after disconnect ipc client and minor checks (diff) | |
parent | Use location of XKBcommon headers, don't expect build in source directory (diff) | |
download | sway-3ca1fa78447ef88f2c438b7f0edbca2e2dde3557.tar.gz sway-3ca1fa78447ef88f2c438b7f0edbca2e2dde3557.tar.zst sway-3ca1fa78447ef88f2c438b7f0edbca2e2dde3557.zip |
Merge pull request #185 from sleep-walker/master
Use location of XKBcommon headers, don't expect build in source direc…
-rw-r--r-- | CMakeLists.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 09f37d6d..d8e4ebca 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
@@ -47,6 +47,7 @@ include_directories( | |||
47 | ${WLC_INCLUDE_DIRS} | 47 | ${WLC_INCLUDE_DIRS} |
48 | ${PCRE_INCLUDE_DIRS} | 48 | ${PCRE_INCLUDE_DIRS} |
49 | ${JSONC_INCLUDE_DIRS} | 49 | ${JSONC_INCLUDE_DIRS} |
50 | ${XKBCOMMON_INCLUDE_DIRS} | ||
50 | include/ | 51 | include/ |
51 | ) | 52 | ) |
52 | 53 | ||
@@ -88,12 +89,12 @@ ADD_CUSTOM_TARGET(man ALL | |||
88 | DEPENDS ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/sway.5) | 89 | DEPENDS ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/sway.5) |
89 | 90 | ||
90 | INSTALL( | 91 | INSTALL( |
91 | FILES ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/sway.1 | 92 | FILES ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/sway.1 |
92 | DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1 | 93 | DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1 |
93 | ) | 94 | ) |
94 | 95 | ||
95 | INSTALL( | 96 | INSTALL( |
96 | FILES ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/sway.5 | 97 | FILES ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/sway.5 |
97 | DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man5 | 98 | DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man5 |
98 | ) | 99 | ) |
99 | 100 | ||