Skip to content

Commit c88eb22

Browse files
authored
Merge pull request #5678 from apple/🍒/rome/b5467ecc0f3b22082023e99412d4148ac41530be
[lldb] Use LLDB_ENABLE_SWIG as the canonical CMake variable
2 parents 7eca50c + 5c8fc38 commit c88eb22

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

lldb/cmake/modules/FindLuaAndSwig.cmake

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,15 @@
44
#
55
# Find Lua and SWIG as a whole.
66

7-
if(LUA_LIBRARIES AND LUA_INCLUDE_DIR AND SWIG_EXECUTABLE)
7+
if(LUA_LIBRARIES AND LUA_INCLUDE_DIR AND LLDB_ENABLE_SWIG)
88
set(LUAANDSWIG_FOUND TRUE)
99
else()
1010
if (LLDB_ENABLE_SWIG OR LLDB_USE_STATIC_BINDINGS)
1111
find_package(Lua 5.3 EXACT)
12-
if(LUA_FOUND AND SWIG_FOUND)
12+
if(LUA_FOUND)
1313
mark_as_advanced(
1414
LUA_LIBRARIES
15-
LUA_INCLUDE_DIR
16-
SWIG_EXECUTABLE)
15+
LUA_INCLUDE_DIR)
1716
endif()
1817
else()
1918
message(STATUS "SWIG 3 or later is required for Lua support in LLDB but could not be found")

lldb/cmake/modules/FindPythonAndSwig.cmake

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,11 @@ macro(FindPython3)
3030
Python3_LIBRARIES
3131
Python3_INCLUDE_DIRS
3232
Python3_EXECUTABLE
33-
Python3_RPATH
34-
SWIG_EXECUTABLE)
33+
Python3_RPATH)
3534
endif()
3635
endmacro()
3736

38-
if(Python3_LIBRARIES AND Python3_INCLUDE_DIRS AND Python3_EXECUTABLE AND SWIG_EXECUTABLE)
37+
if(Python3_LIBRARIES AND Python3_INCLUDE_DIRS AND Python3_EXECUTABLE AND LLDB_ENABLE_SWIG)
3938
set(PYTHONANDSWIG_FOUND TRUE)
4039
else()
4140
if (LLDB_ENABLE_SWIG OR LLDB_USE_STATIC_BINDINGS)

0 commit comments

Comments
 (0)