Author: Jonas Devlieghere Date: 2020-08-12T16:28:46-07:00 New Revision: fbfd831ddac2a9dd2e7bcdf179c88de7c9c5f5ae
URL: https://github.com/llvm/llvm-project/commit/fbfd831ddac2a9dd2e7bcdf179c88de7c9c5f5ae DIFF: https://github.com/llvm/llvm-project/commit/fbfd831ddac2a9dd2e7bcdf179c88de7c9c5f5ae.diff LOG: [lldb] Fix relative imports and set the appropriate include dirs After moving python.swig and lua.swig into their respective subdirectories, the relative paths in these files were out of date. This fixes that and ensures the appropriate include paths are set in the SWIG invocation. Differential revision: https://reviews.llvm.org/D85859 Added: Modified: lldb/bindings/lua/CMakeLists.txt lldb/bindings/lua/lua.swig lldb/bindings/python/CMakeLists.txt lldb/bindings/python/python.swig Removed: ################################################################################ diff --git a/lldb/bindings/lua/CMakeLists.txt b/lldb/bindings/lua/CMakeLists.txt index 84ff918d9376..7148f1370456 100644 --- a/lldb/bindings/lua/CMakeLists.txt +++ b/lldb/bindings/lua/CMakeLists.txt @@ -5,6 +5,7 @@ add_custom_command( DEPENDS ${SWIG_HEADERS} COMMAND ${SWIG_EXECUTABLE} ${SWIG_COMMON_FLAGS} + -I${CMAKE_CURRENT_SOURCE_DIR} -lua -w503 -outdir ${CMAKE_CURRENT_BINARY_DIR} diff --git a/lldb/bindings/lua/lua.swig b/lldb/bindings/lua/lua.swig index 9bfc49b359bc..524d1b5a8036 100644 --- a/lldb/bindings/lua/lua.swig +++ b/lldb/bindings/lua/lua.swig @@ -9,13 +9,13 @@ %module lldb %include <std_string.i> -%include "./lua/lua-typemaps.swig" -%include "./macros.swig" -%include "./headers.swig" +%include "lua-typemaps.swig" +%include "macros.swig" +%include "headers.swig" %{ using namespace lldb_private; using namespace lldb; %} -%include "./interfaces.swig" +%include "interfaces.swig" diff --git a/lldb/bindings/python/CMakeLists.txt b/lldb/bindings/python/CMakeLists.txt index b8ed1fa8dc8a..dc097cbe0468 100644 --- a/lldb/bindings/python/CMakeLists.txt +++ b/lldb/bindings/python/CMakeLists.txt @@ -6,6 +6,7 @@ add_custom_command( DEPENDS ${SWIG_HEADERS} COMMAND ${SWIG_EXECUTABLE} ${SWIG_COMMON_FLAGS} + -I${CMAKE_CURRENT_SOURCE_DIR} -c++ -shadow -python diff --git a/lldb/bindings/python/python.swig b/lldb/bindings/python/python.swig index 5b1269878dac..66a75328d1e7 100644 --- a/lldb/bindings/python/python.swig +++ b/lldb/bindings/python/python.swig @@ -111,9 +111,9 @@ def lldb_iter(obj, getsize, getelem): %} %include <std_string.i> -%include "./python/python-typemaps.swig" -%include "./macros.swig" -%include "./headers.swig" +%include "python-typemaps.swig" +%include "macros.swig" +%include "headers.swig" %{ #include "../source/Plugins/ScriptInterpreter/Python/PythonDataObjects.h" @@ -123,9 +123,9 @@ using namespace lldb_private::python; using namespace lldb; %} -%include "./interfaces.swig" -%include "./python/python-extensions.swig" -%include "./python/python-wrapper.swig" +%include "interfaces.swig" +%include "python-extensions.swig" +%include "python-wrapper.swig" %pythoncode%{ _initialize = True _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
