commit 3ca1fa78447ef88f2c438b7f0edbca2e2dde3557
parent c963aa7ceda5f5a5ea5d648ec291d62b74e84ac9
Author: Drew DeVault <sir@cmpwn.com>
Date: Wed, 30 Sep 2015 08:30:43 -0400
Merge pull request #185 from sleep-walker/master
Use location of XKBcommon headers, don't expect build in source direc…
Diffstat:
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -47,6 +47,7 @@ include_directories(
${WLC_INCLUDE_DIRS}
${PCRE_INCLUDE_DIRS}
${JSONC_INCLUDE_DIRS}
+ ${XKBCOMMON_INCLUDE_DIRS}
include/
)
@@ -88,12 +89,12 @@ ADD_CUSTOM_TARGET(man ALL
DEPENDS ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/sway.5)
INSTALL(
- FILES ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/sway.1
+ FILES ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/sway.1
DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1
)
INSTALL(
- FILES ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/sway.5
+ FILES ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/sway.5
DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man5
)