Author: Jonas Devlieghere Date: 2021-01-08T08:47:21-08:00 New Revision: cb6d53ccdc7288f1bb62b0d50055545acfb59f77
URL: https://github.com/llvm/llvm-project/commit/cb6d53ccdc7288f1bb62b0d50055545acfb59f77 DIFF: https://github.com/llvm/llvm-project/commit/cb6d53ccdc7288f1bb62b0d50055545acfb59f77.diff LOG: [lldb] Bump the required SWIG version to 3 Bump the required SWIG version to 3. If my memory serves me well we last bumped the required SWIG version to 2 for Python 3. At that time SWIG 3 had already been around for a while so everyone I know was already using that. It appears that SWIG 3 is the only version that officially supports C++11 which we're using in the typemap. SWIG 3 was released in 2014 so I think it's reasonable to make that the minimum required version. https://bugs.llvm.org/show_bug.cgi?id=48685 Differential revision: https://reviews.llvm.org/D94244 Added: Modified: lldb/cmake/modules/FindLuaAndSwig.cmake lldb/cmake/modules/FindPythonAndSwig.cmake lldb/docs/resources/build.rst Removed: ################################################################################ diff --git a/lldb/cmake/modules/FindLuaAndSwig.cmake b/lldb/cmake/modules/FindLuaAndSwig.cmake index 968f905ef2d3..f6251bbd1042 100644 --- a/lldb/cmake/modules/FindLuaAndSwig.cmake +++ b/lldb/cmake/modules/FindLuaAndSwig.cmake @@ -7,7 +7,7 @@ if(LUA_LIBRARIES AND LUA_INCLUDE_DIR AND SWIG_EXECUTABLE) set(LUAANDSWIG_FOUND TRUE) else() - find_package(SWIG 2.0) + find_package(SWIG 3.0) if (SWIG_FOUND) find_package(Lua 5.3) if(LUA_FOUND AND SWIG_FOUND) @@ -17,7 +17,7 @@ else() SWIG_EXECUTABLE) endif() else() - message(STATUS "SWIG 2 or later is required for Lua support in LLDB but could not be found") + message(STATUS "SWIG 3 or later is required for Lua support in LLDB but could not be found") endif() include(FindPackageHandleStandardArgs) diff --git a/lldb/cmake/modules/FindPythonAndSwig.cmake b/lldb/cmake/modules/FindPythonAndSwig.cmake index dcbc386b70dd..3535b548c45f 100644 --- a/lldb/cmake/modules/FindPythonAndSwig.cmake +++ b/lldb/cmake/modules/FindPythonAndSwig.cmake @@ -38,11 +38,11 @@ endmacro() if(Python3_LIBRARIES AND Python3_INCLUDE_DIRS AND Python3_EXECUTABLE AND SWIG_EXECUTABLE) set(PYTHONANDSWIG_FOUND TRUE) else() - find_package(SWIG 2.0) + find_package(SWIG 3.0) if (SWIG_FOUND) FindPython3() else() - message(STATUS "SWIG 2 or later is required for Python support in LLDB but could not be found") + message(STATUS "SWIG 3 or later is required for Python support in LLDB but could not be found") endif() get_property(MULTI_CONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) diff --git a/lldb/docs/resources/build.rst b/lldb/docs/resources/build.rst index 8aadd126ed0b..825f86459d7f 100644 --- a/lldb/docs/resources/build.rst +++ b/lldb/docs/resources/build.rst @@ -34,7 +34,7 @@ If you want to run the test suite, you'll need to build LLDB with Python scripting support. * `Python <http://www.python.org/>`_ -* `SWIG <http://swig.org/>`_ 2 or later. +* `SWIG <http://swig.org/>`_ 3 or later. Optional Dependencies ********************* _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
