This is an archive of the discontinued LLVM Phabricator instance.

Differential D68613

[CMake] Fix building without python on Windows
ClosedPublic

Authored by xiaobai on Oct 7 2019, 5:30 PM.

Details

Reviewers
stella.stamenova
JDevlieghere
labath
mgorny
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.

Diff Detail

Event Timeline

xiaobai created this revision.Oct 7 2019, 5:30 PM
Herald added a project: Restricted Project. · View Herald TranscriptOct 7 2019, 5:30 PM
JDevlieghere accepted this revision.Oct 7 2019, 6:09 PM
This revision is now accepted and ready to land.Oct 7 2019, 6:09 PM
Harbormaster completed remote builds in B39132: Diff 223706.Oct 7 2019, 10:06 PM
stella.stamenova accepted this revision.Oct 8 2019, 9:13 AM
xiaobai closed this revision.Oct 8 2019, 3:17 PM

rL374100

Revision Contents

PathSize
lldb/
cmake/
modules/
9 lines

Diff 223706

lldb/cmake/modules/LLDBConfig.cmake

Show First 20 Lines • Show All 261 Lines • ▼ Show 20 Linesfunction(find_python_libs_windows)
set(PYTHON_VERSION_PATCH "${PYTHON_VERSION_PATCH}" PARENT_SCOPE) set(PYTHON_VERSION_PATCH "${PYTHON_VERSION_PATCH}" PARENT_SCOPE)
message(STATUS "LLDB Found PythonExecutable: ${PYTHON_EXECUTABLE} (${PYTHON_VERSION_STRING})") message(STATUS "LLDB Found PythonExecutable: ${PYTHON_EXECUTABLE} (${PYTHON_VERSION_STRING})")
message(STATUS "LLDB Found PythonLibs: ${PYTHON_LIBRARY} (${PYTHONLIBS_VERSION_STRING})") message(STATUS "LLDB Found PythonLibs: ${PYTHON_LIBRARY} (${PYTHONLIBS_VERSION_STRING})")
message(STATUS "LLDB Found PythonDLL: ${PYTHON_DLL}") message(STATUS "LLDB Found PythonDLL: ${PYTHON_DLL}")
message(STATUS "LLDB Found PythonIncludeDirs: ${PYTHON_INCLUDE_DIR}") message(STATUS "LLDB Found PythonIncludeDirs: ${PYTHON_INCLUDE_DIR}")
endfunction(find_python_libs_windows) endfunction(find_python_libs_windows)
if (NOT LLDB_DISABLE_PYTHON) # Call find_python_libs_windows ahead of the rest of the python configuration.
if ("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows") # 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() find_python_libs_windows()
endif()
if (NOT LLDB_DISABLE_PYTHON)
if ("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows")
if (NOT LLDB_RELOCATABLE_PYTHON) if (NOT LLDB_RELOCATABLE_PYTHON)
file(TO_CMAKE_PATH "${PYTHON_HOME}" LLDB_PYTHON_HOME) file(TO_CMAKE_PATH "${PYTHON_HOME}" LLDB_PYTHON_HOME)
add_definitions( -DLLDB_PYTHON_HOME="${LLDB_PYTHON_HOME}" ) add_definitions( -DLLDB_PYTHON_HOME="${LLDB_PYTHON_HOME}" )
endif() endif()
else() else()
find_package(PythonInterp REQUIRED) find_package(PythonInterp REQUIRED)
find_package(PythonLibs REQUIRED) find_package(PythonLibs REQUIRED)
endif() endif()
▲ Show 20 Lines • Show All 225 Lines • Show Last 20 Lines