Merge pull request #5636 from apple/jdevlieghere/autodetect-static-bindings

[lldb] Auto-detect whether to use the static bindings

Author: JDevlieghere

lldb/bindings/python/CMakeLists.txt

@@ -189,6 +189,8 @@ function(finish_swig_python swig_target lldb_python_bindings_dir lldb_python_tar
       COMMAND ${CMAKE_COMMAND} -E copy ${PYTHON_DLL_NATIVE_PATH} ${LLDB_BIN_DIR} VERBATIM
       COMMENT "Copying Python DLL to LLDB binaries directory.")
   endif()
+
+
 endfunction()
 
 if(${LLDB_USE_STATIC_BINDINGS})

lldb/cmake/modules/FindLuaAndSwig.cmake

@@ -7,11 +7,7 @@
 if(LUA_LIBRARIES AND LUA_INCLUDE_DIR AND SWIG_EXECUTABLE)
   set(LUAANDSWIG_FOUND TRUE)
 else()
-  find_package(SWIG 3.0 QUIET)
-  if (SWIG_FOUND OR LLDB_USE_STATIC_BINDINGS)
-    if (LLDB_USE_STATIC_BINDINGS)
-      set(SWIG_EXECUTABLE "/not/found")
-    endif()
+  if (LLDB_ENABLE_SWIG OR LLDB_USE_STATIC_BINDINGS)
     find_package(Lua 5.3 EXACT)
     if(LUA_FOUND AND SWIG_FOUND)
       mark_as_advanced(
@@ -23,12 +19,12 @@ else()
     message(STATUS "SWIG 3 or later is required for Lua support in LLDB but could not be found")
   endif()
 
+
   include(FindPackageHandleStandardArgs)
   find_package_handle_standard_args(LuaAndSwig
                                     FOUND_VAR
                                       LUAANDSWIG_FOUND
                                     REQUIRED_VARS
                                       LUA_LIBRARIES
-                                      LUA_INCLUDE_DIR
-                                      SWIG_EXECUTABLE)
+                                      LUA_INCLUDE_DIR)
 endif()

lldb/cmake/modules/FindPythonAndSwig.cmake

@@ -38,12 +38,8 @@ endmacro()
 if(Python3_LIBRARIES AND Python3_INCLUDE_DIRS AND Python3_EXECUTABLE AND SWIG_EXECUTABLE)
   set(PYTHONANDSWIG_FOUND TRUE)
 else()
-  find_package(SWIG 3.0)
-  if (SWIG_FOUND OR LLDB_USE_STATIC_BINDINGS)
-      if (LLDB_USE_STATIC_BINDINGS)
-        set(SWIG_EXECUTABLE "/not/found")
-      endif()
-      FindPython3()
+  if (LLDB_ENABLE_SWIG OR LLDB_USE_STATIC_BINDINGS)
+    FindPython3()
   else()
     message(STATUS "SWIG 3 or later is required for Python support in LLDB but could not be found")
   endif()
@@ -66,6 +62,5 @@ else()
                                     REQUIRED_VARS
                                       Python3_LIBRARIES
                                       Python3_INCLUDE_DIRS
-                                      Python3_EXECUTABLE
-                                      SWIG_EXECUTABLE)
+                                      Python3_EXECUTABLE)
 endif()

lldb/cmake/modules/LLDBConfig.cmake

@@ -56,6 +56,17 @@ macro(add_optional_dependency variable description package found)
   message(STATUS "${description}: ${${variable}}")
 endmacro()
 
+add_optional_dependency(LLDB_ENABLE_SWIG "Enable SWIG to generate LLDB bindings" SWIG SWIG_FOUND VERSION 3)
+
+# BEGIN SWIFT MOD
+if (LLDB_ENABLE_SWIG)
+  set(LLDB_ENABLE_STATIC_BINDINGS FALSE)
+else()
+  set(LLDB_ENABLE_STATIC_BINDINGS TRUE)
+endif()
+option(LLDB_USE_STATIC_BINDINGS "Use the static Python bindings." ${LLDB_ENABLE_STATIC_BINDINGS})
+# END SWIFT MOD
+
 add_optional_dependency(LLDB_ENABLE_LIBEDIT "Enable editline support in LLDB" LibEdit LibEdit_FOUND)
 add_optional_dependency(LLDB_ENABLE_CURSES "Enable curses support in LLDB" CursesAndPanel CURSESANDPANEL_FOUND)
 add_optional_dependency(LLDB_ENABLE_LZMA "Enable LZMA compression support in LLDB" LibLZMA LIBLZMA_FOUND)
@@ -74,7 +85,6 @@ option(LLDB_SKIP_DSYM "Whether to skip generating a dSYM when installing lldb."
 
 # BEGIN SWIFT MOD
 option(LLDB_ENABLE_SWIFT_SUPPORT "Enable swift support" ON)
-option(LLDB_USE_STATIC_BINDINGS "Use the static Python bindings." OFF)
 option(LLDB_ENABLE_WERROR "Fail and stop if a warning is triggered." ${LLVM_ENABLE_WERROR})
 if(LLDB_ENABLE_SWIFT_SUPPORT)
   add_definitions( -DLLDB_ENABLE_SWIFT )