From 7bb42dc6b114f57200abfebaaa01160914be6bba Mon Sep 17 00:00:00 2001 From: Siger Yang Date: Fri, 3 Sep 2021 11:17:37 +0800 Subject: [PATCH] [lldb/lua] Force Lua version to be 5.3 Due to CMake cache, find_package in FindLuaAndSwig.cmake will be ignored. This commit adds EXACT and REQUIRED flags to it and removes find_package in Lua ScriptInterpreter. Signed-off-by: Siger Yang Reviewed By: tammela, JDevlieghere Differential Revision: https://reviews.llvm.org/D108515 --- lldb/cmake/modules/FindLuaAndSwig.cmake | 2 +- lldb/source/Plugins/ScriptInterpreter/Lua/CMakeLists.txt | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/lldb/cmake/modules/FindLuaAndSwig.cmake b/lldb/cmake/modules/FindLuaAndSwig.cmake index f6251bb..84739410 100644 --- a/lldb/cmake/modules/FindLuaAndSwig.cmake +++ b/lldb/cmake/modules/FindLuaAndSwig.cmake @@ -9,7 +9,7 @@ if(LUA_LIBRARIES AND LUA_INCLUDE_DIR AND SWIG_EXECUTABLE) else() find_package(SWIG 3.0) if (SWIG_FOUND) - find_package(Lua 5.3) + find_package(Lua 5.3 EXACT REQUIRED) if(LUA_FOUND AND SWIG_FOUND) mark_as_advanced( LUA_LIBRARIES diff --git a/lldb/source/Plugins/ScriptInterpreter/Lua/CMakeLists.txt b/lldb/source/Plugins/ScriptInterpreter/Lua/CMakeLists.txt index f5c62ee..498bd97 100644 --- a/lldb/source/Plugins/ScriptInterpreter/Lua/CMakeLists.txt +++ b/lldb/source/Plugins/ScriptInterpreter/Lua/CMakeLists.txt @@ -1,5 +1,3 @@ -find_package(Lua REQUIRED) - add_lldb_library(lldbPluginScriptInterpreterLua PLUGIN Lua.cpp ScriptInterpreterLua.cpp -- 2.7.4