maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

lldb: use the newer `find_package` if available 

Now that the rest of LLVM prefers python3 over python2, the LLDB path
should follow suite.  Add a fallback path to python2 for non-Windows
targets.
This commit is contained in:
Saleem Abdulrasool 2020-04-29 03:49:51 +00:00
parent 9f8b4472fb
commit 7c8fa95395
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lldb/cmake/modules/FindPythonInterpAndLibs.cmake
View File

@ -9,11 +9,11 @@ if(PYTHON_LIBRARIES AND PYTHON_INCLUDE_DIRS AND PYTHON_EXECUTABLE AND SWIG_EXECU
else() else()
find_package(SWIG 2.0) find_package(SWIG 2.0)
if (SWIG_FOUND) if (SWIG_FOUND)
if ("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows") if(NOT CMAKE_VERSION VERSION_LESS 3.12)
# Use PYTHON_HOME as a hint to find Python 3. # Use PYTHON_HOME as a hint to find Python 3.
set(Python3_ROOT_DIR "${PYTHON_HOME}") set(Python3_ROOT_DIR "${PYTHON_HOME}")
find_package(Python3 COMPONENTS Interpreter Development) find_package(Python3 COMPONENTS Interpreter Development)
if (Python3_FOUND AND Python3_Interpreter_FOUND) if(Python3_FOUND AND Python3_Interpreter_FOUND)
set(PYTHON_LIBRARIES ${Python3_LIBRARIES}) set(PYTHON_LIBRARIES ${Python3_LIBRARIES})
set(PYTHON_INCLUDE_DIRS ${Python3_INCLUDE_DIRS}) set(PYTHON_INCLUDE_DIRS ${Python3_INCLUDE_DIRS})
set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE}) set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE})
@ -22,6 +22,20 @@ else()
PYTHON_INCLUDE_DIRS PYTHON_INCLUDE_DIRS
PYTHON_EXECUTABLE PYTHON_EXECUTABLE
SWIG_EXECUTABLE) SWIG_EXECUTABLE)
elseif(NOT CMAKE_SYSTEM_NAME STREQUAL Windows)
# Use PYTHON_HOME as a hint to find Python 2.
set(Python2_ROOT_DIR "${PYTHON_HOME}")
find_package(Python2 COMPONENTS Interpreter Development)
if(Python2_FOUND AND Python2_Interpreter_FOUND)
set(PYTHON_LIBRARIES ${Python2_LIBRARIES})
set(PYTHON_INCLUDE_DIRS ${Python2_INCLUDE_DIRS})
set(PYTHON_EXECUTABLE ${Python2_EXECUTABLE})
mark_as_advanced(
PYTHON_LIBRARIES
PYTHON_INCLUDE_DIRS
PYTHON_EXECUTABLE
SWIG_EXECUTABLE)
endif()
endif() endif()
else() else()
find_package(PythonInterp) find_package(PythonInterp)