summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBardur Arantsson <bardur@scientician.net>2010-02-04 10:38:27 +0100
committerBardur Arantsson <bardur@scientician.net>2010-02-04 10:44:17 +0100
commit8b9607a49cc61865445d3eee324d43c51c2792f7 (patch)
tree11dd5a0cdde5355e05a1a6de8c22a7b069717b71
parent23423fc1087ab98baa564715b9fa8c241c5024df (diff)
Use correct paths for out-of-source builds.
Thanks to Kernigh for the fixes.
-rw-r--r--src/CMakeLists.txt5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index eaebcbf6..aed6907b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -5,7 +5,7 @@ ADD_SUBDIRECTORY(lua)
MACRO(TOLUA_FILE MODULE_NAME OUTPUT_FILE_NAME)
ADD_CUSTOM_COMMAND(
OUTPUT ${OUTPUT_FILE_NAME}
- COMMAND tolua -n ${MODULE_NAME} -o ${CMAKE_CURRENT_SOURCE_DIR}/${OUTPUT_FILE_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/${MODULE_NAME}.pkg
+ COMMAND tolua -n ${MODULE_NAME} -o ${CMAKE_CURRENT_BINARY_DIR}/${OUTPUT_FILE_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/${MODULE_NAME}.pkg
DEPENDS tolua ${CMAKE_CURRENT_SOURCE_DIR}/${MODULE_NAME}.pkg
)
SET_SOURCE_FILES_PROPERTIES("${OUTPUT_FILE_NAME}" PROPERTIES GENERATED TRUE)
@@ -23,7 +23,8 @@ TOLUA_FILE(quest w_quest.c)
TOLUA_FILE(dungeon w_dun.c)
# tome executable
-INCLUDE_DIRECTORIES(lua)
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/lua)
ADD_EXECUTABLE(tome main-gcu.c main-x11.c main-xaw.c main-sdl.c
z-rand.c z-util.c z-form.c z-virt.c z-term.c z-sock.c
variable.c tables.c plots.c util.c cave.c dungeon.c