StarMirror/sol2
1
0
Fork 0
mirror of https://github.com/ThePhD/sol2.git synced 2024-03-22 13:10:44 +08:00
Code Issues Projects Releases Wiki Activity

Fix some issues with the build system

Browse Source 
There is still an issue: `aguya.cpp:51:16: error: ‘kaguya’ has not been declared`.

Signed-off-by: Gaël Écorchard <gael@km-robotics.cz>
This commit is contained in:
Gaël Écorchard 2023-10-12 12:59:24 +02:00
parent 9c882a28fd
commit 3be33dc8c3
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmake/Packages/FindKaguyaBuild.cmake
View File

@ -45,6 +45,7 @@ ExternalProject_Add(KAGUYA_BUILD_SOURCE
GIT_SHALLOW TRUE GIT_SHALLOW TRUE
GIT_SUBMODULES "" GIT_SUBMODULES ""
GIT_REPOSITORY https://github.com/satoren/kaguya.git GIT_REPOSITORY https://github.com/satoren/kaguya.git
GIT_TAG main
PREFIX ${kaguya_build_toplevel} PREFIX ${kaguya_build_toplevel}
SOURCE_DIR ${kaguya_build_toplevel} SOURCE_DIR ${kaguya_build_toplevel}
DOWNLOAD_DIR ${kaguya_build_toplevel} DOWNLOAD_DIR ${kaguya_build_toplevel}

8
cmake/Packages/FindLuaBuild/LuaVanilla.cmake
View File

@ -199,7 +199,7 @@ extern \"C\" {
file(TO_NATIVE_PATH "${LUA_VANILLA_SOURCE_LUA_HPP}" LUA_VANILLA_SOURCE_LUA_HPP) file(TO_NATIVE_PATH "${LUA_VANILLA_SOURCE_LUA_HPP}" LUA_VANILLA_SOURCE_LUA_HPP)
endif() endif()
set(LUA_VANILLA_INCLUDE_DIRS ${lua-vanilla_SOURCE_DIR}/include) set(LUA_VANILLA_INCLUDE_DIRS ${lua-vanilla_SOURCE_DIR}/src)
endif() endif()
# # Target names # # Target names
@ -246,12 +246,14 @@ else()
endif() endif()
if (WIN32) if (WIN32)
else() else()
target_compile_definitions(${liblua} target_compile_definitions(${liblua}
PRIVATE LUA_USE_LINUX) PRIVATE LUA_USE_LINUX)
endif() endif()
target_compile_options(${liblua} target_compile_options(${liblua}
PRIVATE ${LUA_VANILLA_LUALIB_COMPILER_OPTIONS}) 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}) target_link_libraries(${liblua} PRIVATE ${CMAKE_DL_LIBS})
if (UNIX) if (UNIX)
target_link_libraries(${liblua} PRIVATE m) target_link_libraries(${liblua} PRIVATE m)