[Lldb-commits] [lldb] 7bb42dc - [lldb/lua] Force Lua version to be 5.3

[Siger Yang via lldb-commits]

Author: Siger Yang
Date: 2021-09-03T15:22:57+08:00
New Revision: 7bb42dc6b114f57200abfebaaa01160914be6bba

URL: https://github.com/llvm/llvm-project/commit/7bb42dc6b114f57200abfebaaa01160914be6bba
DIFF: https://github.com/llvm/llvm-project/commit/7bb42dc6b114f57200abfebaaa01160914be6bba.diff

LOG: [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 <sigeryeung at gmail.com>

Reviewed By: tammela, JDevlieghere

Differential Revision: https://reviews.llvm.org/D108515

Added: 
    

Modified: 
    lldb/cmake/modules/FindLuaAndSwig.cmake
    lldb/source/Plugins/ScriptInterpreter/Lua/CMakeLists.txt

Removed: 
    


################################################################################
diff  --git a/lldb/cmake/modules/FindLuaAndSwig.cmake b/lldb/cmake/modules/FindLuaAndSwig.cmake
index f6251bbd1042c..847394100c5a0 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 f5c62ee3a54f3..498bd97839510 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