Skip to content

Commit 8525c20

Browse files
Gaël ÉcorchardThePhD
Gaël Écorchard
authored andcommitted
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]>
1 parent c4e7247 commit 8525c20

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

cmake/Packages/FindKaguyaBuild.cmake

+1
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ ExternalProject_Add(KAGUYA_BUILD_SOURCE
4545
GIT_SHALLOW TRUE
4646
GIT_SUBMODULES ""
4747
GIT_REPOSITORY https://github.com/satoren/kaguya.git
48+
GIT_TAG main
4849
PREFIX ${kaguya_build_toplevel}
4950
SOURCE_DIR ${kaguya_build_toplevel}
5051
DOWNLOAD_DIR ${kaguya_build_toplevel}

cmake/Packages/FindLuaBuild/LuaVanilla.cmake

+5-3
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ extern \"C\" {
199199
file(TO_NATIVE_PATH "${LUA_VANILLA_SOURCE_LUA_HPP}" LUA_VANILLA_SOURCE_LUA_HPP)
200200
endif()
201201

202-
set(LUA_VANILLA_INCLUDE_DIRS ${lua-vanilla_SOURCE_DIR}/include)
202+
set(LUA_VANILLA_INCLUDE_DIRS ${lua-vanilla_SOURCE_DIR}/src)
203203
endif()
204204

205205
# # Target names
@@ -246,12 +246,14 @@ else()
246246
endif()
247247
if (WIN32)
248248
else()
249-
target_compile_definitions(${liblua}
249+
target_compile_definitions(${liblua}
250250
PRIVATE LUA_USE_LINUX)
251251
endif()
252252
target_compile_options(${liblua}
253253
PRIVATE ${LUA_VANILLA_LUALIB_COMPILER_OPTIONS})
254-
add_dependencies(${liblua} LUA_VANILLA)
254+
if (LUA_LOCAL_DIR)
255+
add_dependencies(${liblua} LUA_VANILLA)
256+
endif()
255257
target_link_libraries(${liblua} PRIVATE ${CMAKE_DL_LIBS})
256258
if (UNIX)
257259
target_link_libraries(${liblua} PRIVATE m)

0 commit comments

Comments
 (0)