From 28fcc033c883f95416e920ff05f629df2c560a23 Mon Sep 17 00:00:00 2001 From: Alex Langford Date: Tue, 8 Oct 2019 18:38:46 +0000 Subject: [PATCH] [CMake] Fix building without python on Windows Summary: find_python_libs_windows might set LLDB_DISABLE_PYTHON to ON. Unfortunately we do not re-check this variable before using variables filled in by find_python_libs_windows, leading to a failed configuration. llvm-svn: 374100 --- lldb/cmake/modules/LLDBConfig.cmake | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lldb/cmake/modules/LLDBConfig.cmake b/lldb/cmake/modules/LLDBConfig.cmake index e409d73..6c6930d 100644 --- a/lldb/cmake/modules/LLDBConfig.cmake +++ b/lldb/cmake/modules/LLDBConfig.cmake @@ -267,10 +267,15 @@ function(find_python_libs_windows) message(STATUS "LLDB Found PythonIncludeDirs: ${PYTHON_INCLUDE_DIR}") endfunction(find_python_libs_windows) +# Call find_python_libs_windows ahead of the rest of the python configuration. +# It's possible that it won't find a python installation and will then set +# LLDB_DISABLE_PYTHON to ON. +if (NOT LLDB_DISABLE_PYTHON AND "${CMAKE_SYSTEM_NAME}" STREQUAL "Windows") + find_python_libs_windows() +endif() + if (NOT LLDB_DISABLE_PYTHON) if ("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows") - find_python_libs_windows() - if (NOT LLDB_RELOCATABLE_PYTHON) file(TO_CMAKE_PATH "${PYTHON_HOME}" LLDB_PYTHON_HOME) add_definitions( -DLLDB_PYTHON_HOME="${LLDB_PYTHON_HOME}" ) -- 2.7.4