From 4a217d76287090d1a3f1e1f1a9d4145016247c5f Mon Sep 17 00:00:00 2001 From: iThorgrim Date: Tue, 19 Aug 2025 16:46:47 +0200 Subject: [PATCH] fix: Fix build with lua5.1, lua5.3, lua5.4 --- CMakeLists.txt | 4 ---- src/lualib/luajit/CMakeLists.txt | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 00b9b25e26..41b59b0f1c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,10 +16,6 @@ endif() if (LUA_VERSION MATCHES "luajit") add_subdirectory(src/lualib/luajit) - set(LUAJIT_VERSION true) else() add_subdirectory(src/lualib/lua) - set(LUAJIT_VERSION false) endif() - -set_target_properties(lualib PROPERTIES INTERFACE_COMPILE_DEFINITIONS LUAJIT_VERSION) diff --git a/src/lualib/luajit/CMakeLists.txt b/src/lualib/luajit/CMakeLists.txt index f0b184ed7b..1530f3ec69 100644 --- a/src/lualib/luajit/CMakeLists.txt +++ b/src/lualib/luajit/CMakeLists.txt @@ -60,6 +60,7 @@ if (WIN32) PROPERTIES IMPORTED_LOCATION ${LUA_BIN_FOLDER}/src/lua51.lib INTERFACE_INCLUDE_DIRECTORIES "${LUA_SRC_FOLDER}/src" + INTERFACE_COMPILE_DEFINITIONS "LUAJIT_VERSION=1" ) # install generated files @@ -92,6 +93,7 @@ if (WIN32) IMPORTED_LOCATION ${LUA_BIN_FOLDER}/src/lua51.dll IMPORTED_IMPLIB ${LUA_BIN_FOLDER}/src/lua51.lib INTERFACE_INCLUDE_DIRECTORIES "${LUA_SRC_FOLDER}/src" + INTERFACE_COMPILE_DEFINITIONS "LUAJIT_VERSION=1" ) # install generated files @@ -147,6 +149,7 @@ if (UNIX OR APPLE) PROPERTIES # IMPORTED_LOCATION ${LUAJIT_LIB_PATH} # cmake bullshit. spent days figuring this and turns out set_target_properties does squat shit while set_property works fine. INTERFACE_INCLUDE_DIRECTORIES "${LUA_SRC_FOLDER}/src" + INTERFACE_COMPILE_DEFINITIONS "LUAJIT_VERSION=1" ) set_property(TARGET lualib PROPERTY IMPORTED_LOCATION ${LUAJIT_LIB_PATH}) @@ -154,3 +157,4 @@ if (UNIX OR APPLE) install(DIRECTORY ${LUA_INSTALL_PATH}/ DESTINATION ${CMAKE_INSTALL_PREFIX}) endif() +