From 3cf671b4fcd567c52aa88b08a5fd7b59cf7d669a Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Sun, 12 Jul 2020 23:38:13 +0100 Subject: Jenkins fixes --- CMake/AddDependencies.cmake | 2 +- CMake/Fixups.cmake | 2 +- CMake/GenerateBindings.cmake | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'CMake') diff --git a/CMake/AddDependencies.cmake b/CMake/AddDependencies.cmake index 5173e4487..971a338cc 100644 --- a/CMake/AddDependencies.cmake +++ b/CMake/AddDependencies.cmake @@ -62,7 +62,7 @@ function(link_dependencies TARGET) fmt::fmt jsoncpp_lib lsqlite - lua + lualib luaexpat mbedtls SQLiteCpp diff --git a/CMake/Fixups.cmake b/CMake/Fixups.cmake index 374196d09..f8f616254 100644 --- a/CMake/Fixups.cmake +++ b/CMake/Fixups.cmake @@ -2,7 +2,7 @@ function(emit_fixups) # TODO these should be in the submodules # Under Windows, we need Lua as DLL; on *nix we need it linked statically: if (WIN32) - target_compile_definitions(lua PUBLIC LUA_BUILD_AS_DLL) + target_compile_definitions(lualib PUBLIC LUA_BUILD_AS_DLL) endif() # Let Lua use additional checks on its C API. This is only compiled into Debug builds: diff --git a/CMake/GenerateBindings.cmake b/CMake/GenerateBindings.cmake index 584ad1b66..d91d26a03 100644 --- a/CMake/GenerateBindings.cmake +++ b/CMake/GenerateBindings.cmake @@ -107,8 +107,8 @@ function(enable_bindings_generation) # Generate the bindings: add_custom_command( OUTPUT ${BINDING_OUTPUTS} - COMMAND luaexe BindingsProcessor.lua + COMMAND lua BindingsProcessor.lua WORKING_DIRECTORY ${BINDINGS_FOLDER} - DEPENDS ${BINDING_DEPENDENCIES} luaexe + DEPENDS ${BINDING_DEPENDENCIES} lua ) endfunction() -- cgit v1.2.3