Mercurial > hlog

changeset 634:841ede63ed32

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
build: make out-of-tree builds work Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
author Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
date Sun, 02 Oct 2022 09:20:44 -0400
parents ab357ee313b3
children 1b17be7ff8e8
files common/CMakeLists.txt xlua/CMakeLists.txt
diffstat 2 files changed, 15 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/common/CMakeLists.txt	Sat Oct 01 20:48:31 2022 -0400
+++ b/common/CMakeLists.txt	Sun Oct 02 09:20:44 2022 -0400
@@ -29,10 +29,6 @@
 		-P ${CMAKE_SOURCE_DIR}/cmake/hg.cmake
 )
 
-include_directories(
-	include
-)
-
 add_library(hlogcommon SHARED
 	adif.c
 	adif-mode.c
@@ -57,6 +53,14 @@
 
 add_dependencies(hlogcommon revisiontag)
 
+target_include_directories(hlogcommon
+	PUBLIC
+	include
+
+	PRIVATE
+	${CMAKE_CURRENT_BINARY_DIR}
+)
+
 target_link_libraries(hlogcommon PRIVATE
 	${JEFFPC_LIBRARY}
 	m
--- a/xlua/CMakeLists.txt	Sat Oct 01 20:48:31 2022 -0400
+++ b/xlua/CMakeLists.txt	Sun Oct 02 09:20:44 2022 -0400
@@ -34,7 +34,7 @@
 
 set(LUA_SCRIPTS_C "${CMAKE_CURRENT_BINARY_DIR}/scripts_table.c")
 foreach(script ${LUA_SCRIPTS})
-	set(luafile  "scripts/${script}.lua")
+	set(luafile  "${CMAKE_CURRENT_SOURCE_DIR}/scripts/${script}.lua")
 	set(luacfile "${CMAKE_CURRENT_BINARY_DIR}/scripts/${script}.luac")
 	set(cfile    "${CMAKE_CURRENT_BINARY_DIR}/scripts/${script}.c")
 	string(SHA1 namehash "${luafile}")
@@ -85,8 +85,13 @@
 	${LUA_SCRIPTS_C}
 )
 
-target_include_directories(hloglua PUBLIC
+target_include_directories(hloglua
+	PUBLIC
 	${LUA_INCLUDE_DIR}
+
+	PRIVATE
+	${CMAKE_CURRENT_SOURCE_DIR}
+	${CMAKE_CURRENT_BINARY_DIR}
 )
 
 target_link_libraries(hloglua