Fix some issues with the build system

There is still an issue: `aguya.cpp:51:16: error: ‘kaguya’ has not been declared`. Signed-off-by: Gaël Écorchard <[email protected]>
ThePhD · Jul 13, 2024 · 8525c20 · 8525c20
1 parent c4e7247
commit 8525c20
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/cmake/Packages/FindKaguyaBuild.cmake b/cmake/Packages/FindKaguyaBuild.cmake
@@ -45,6 +45,7 @@ ExternalProject_Add(KAGUYA_BUILD_SOURCE
 	GIT_SHALLOW TRUE
 	GIT_SUBMODULES ""
 	GIT_REPOSITORY https://github.com/satoren/kaguya.git
+	GIT_TAG main
 	PREFIX ${kaguya_build_toplevel}
 	SOURCE_DIR ${kaguya_build_toplevel}
 	DOWNLOAD_DIR ${kaguya_build_toplevel}

diff --git a/cmake/Packages/FindLuaBuild/LuaVanilla.cmake b/cmake/Packages/FindLuaBuild/LuaVanilla.cmake
@@ -199,7 +199,7 @@ extern \"C\" {
 		file(TO_NATIVE_PATH "${LUA_VANILLA_SOURCE_LUA_HPP}" LUA_VANILLA_SOURCE_LUA_HPP)
 	endif()
 
-	set(LUA_VANILLA_INCLUDE_DIRS ${lua-vanilla_SOURCE_DIR}/include)
+	set(LUA_VANILLA_INCLUDE_DIRS ${lua-vanilla_SOURCE_DIR}/src)
 endif()
 
 # # Target names
@@ -246,12 +246,14 @@ else()
 endif()
 if (WIN32)
 else()
-	target_compile_definitions(${liblua} 
+	target_compile_definitions(${liblua}
 		PRIVATE LUA_USE_LINUX)
 endif()
 target_compile_options(${liblua}
 	PRIVATE ${LUA_VANILLA_LUALIB_COMPILER_OPTIONS})
-add_dependencies(${liblua} LUA_VANILLA)
+if (LUA_LOCAL_DIR)
+	add_dependencies(${liblua} LUA_VANILLA)
+endif()
 target_link_libraries(${liblua} PRIVATE ${CMAKE_DL_LIBS})
 if (UNIX)
 	target_link_libraries(${liblua} PRIVATE m)