From f27ae736175a3cc339af15ffc8ad3cb518224c0c Mon Sep 17 00:00:00 2001 From: Zachary Turner Date: Thu, 18 Dec 2014 21:25:53 +0000 Subject: [PATCH] Always use python-based SWIG generation script for CMake. As a first step in addressing Bug #21921 this patch prefers the python-based SWIG generation by default rather than the shell-based SWIG generation any time python is enabled (e.g. LLDB_DISABLE_PYTHON is 0). Additionally, this patch changes the default value of LLDB_DISABLE_PYTHON from 1 to 0 on Windows. Anyone not using the CMake build is unaffected by this patch. llvm-svn: 224543 --- lldb/CMakeLists.txt | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/lldb/CMakeLists.txt b/lldb/CMakeLists.txt index 4a0f996..8f20d8c 100644 --- a/lldb/CMakeLists.txt +++ b/lldb/CMakeLists.txt @@ -1,20 +1,13 @@ if ( CMAKE_SYSTEM_NAME MATCHES "Windows" ) - set(LLDB_DEFAULT_DISABLE_PYTHON 1) + set(LLDB_DEFAULT_DISABLE_PYTHON 0) set(LLDB_DEFAULT_DISABLE_CURSES 1) - if (LLDB_DISABLE_PYTHON) - set(LLDB_DEFAULT_ENABLE_PYTHON_SCRIPTS_SWIG_API_GENERATION 0) - else() - set(LLDB_DEFAULT_ENABLE_PYTHON_SCRIPTS_SWIG_API_GENERATION 1) - endif() else() if ( __ANDROID_NDK__ ) set(LLDB_DEFAULT_DISABLE_PYTHON 1) set(LLDB_DEFAULT_DISABLE_CURSES 1) - set(LLDB_DEFAULT_ENABLE_PYTHON_SCRIPTS_SWIG_API_GENERATION 0) else() set(LLDB_DEFAULT_DISABLE_PYTHON 0) set(LLDB_DEFAULT_DISABLE_CURSES 0) - set(LLDB_DEFAULT_ENABLE_PYTHON_SCRIPTS_SWIG_API_GENERATION 0) endif() endif() set(LLDB_DISABLE_PYTHON ${LLDB_DEFAULT_DISABLE_PYTHON} CACHE BOOL @@ -22,6 +15,12 @@ set(LLDB_DISABLE_PYTHON ${LLDB_DEFAULT_DISABLE_PYTHON} CACHE BOOL set(LLDB_DISABLE_CURSES ${LLDB_DEFAULT_DISABLE_CURSES} CACHE BOOL "Disables the Curses integration.") +if ( LLDB_DISABLE_PYTHON ) + set(LLDB_DEFAULT_ENABLE_PYTHON_SCRIPTS_SWIG_API_GENERATION 0) +else () + set(LLDB_DEFAULT_ENABLE_PYTHON_SCRIPTS_SWIG_API_GENERATION 1) +endif () + set(LLDB_ENABLE_PYTHON_SCRIPTS_SWIG_API_GENERATION ${LLDB_DEFAULT_ENABLE_PYTHON_SCRIPTS_SWIG_API_GENERATION} CACHE BOOL "Enables using new Python scripts for SWIG API generation .") -- 2.7.4