mirrors/llvm-project
0
0
Fork 0
mirror of https://github.com/llvm/llvm-project.git synced 2025-04-26 15:26:06 +00:00
Code Issues Projects Releases Wiki Activity

[lldb] Remove CMAKE_VERSION checks now that the minimum version is 3.13.4

Browse Source
This commit is contained in:
Jonas Devlieghere 2020-07-27 12:30:09 -07:00
parent adffce7153
commit 536baa11cf
2 changed files with 7 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -61,46 +61,22 @@ if(PYTHON_LIBRARIES AND PYTHON_INCLUDE_DIRS AND PYTHON_EXECUTABLE AND SWIG_EXECU
else()
find_package(SWIG 2.0)
if (SWIG_FOUND)
if(NOT CMAKE_VERSION VERSION_LESS 3.12)
if (LLDB_PYTHON_VERSION)
if (LLDB_PYTHON_VERSION VERSION_EQUAL "2")
FindPython2()
elseif(LLDB_PYTHON_VERSION VERSION_EQUAL "3")
FindPython3()
endif()
else()
if (LLDB_PYTHON_VERSION)
if (LLDB_PYTHON_VERSION VERSION_EQUAL "2")
FindPython2()
elseif(LLDB_PYTHON_VERSION VERSION_EQUAL "3")
FindPython3()
if (NOT PYTHON3_FOUND AND NOT CMAKE_SYSTEM_NAME STREQUAL Windows)
FindPython2()
endif()
endif()
else()
find_package(PythonInterp)
find_package(PythonLibs)
if(PYTHONINTERP_FOUND AND PYTHONLIBS_FOUND AND SWIG_FOUND)
if (NOT CMAKE_CROSSCOMPILING)
string(REPLACE "." ";" pythonlibs_version_list ${PYTHONLIBS_VERSION_STRING})
list(GET pythonlibs_version_list 0 pythonlibs_major)
list(GET pythonlibs_version_list 1 pythonlibs_minor)
# Ignore the patch version. Some versions of macOS report a different
# patch version for the system provided interpreter and libraries.
if (CMAKE_CROSSCOMPILING OR (PYTHON_VERSION_MAJOR VERSION_EQUAL pythonlibs_major AND
PYTHON_VERSION_MINOR VERSION_EQUAL pythonlibs_minor))
mark_as_advanced(
PYTHON_LIBRARIES
PYTHON_INCLUDE_DIRS
PYTHON_EXECUTABLE
SWIG_EXECUTABLE)
endif()
endif()
FindPython3()
if (NOT PYTHON3_FOUND AND NOT CMAKE_SYSTEM_NAME STREQUAL Windows)
FindPython2()
endif()
endif()
else()
message(STATUS "SWIG 2 or later is required for Python support in LLDB but could not be found")
endif()
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(PythonInterpAndLibs
FOUND_VAR

5
lldb/cmake/modules/LLDBConfig.cmake
View File

@ -79,11 +79,6 @@ if(LLDB_BUILD_FRAMEWORK)
if(NOT APPLE)
message(FATAL_ERROR "LLDB.framework can only be generated when targeting Apple platforms")
endif()
# CMake 3.6 did not correctly emit POST_BUILD commands for Apple Framework targets
# CMake < 3.8 did not have the BUILD_RPATH target property
if(CMAKE_VERSION VERSION_LESS 3.8)
message(FATAL_ERROR "LLDB_BUILD_FRAMEWORK is not supported on CMake < 3.8")
endif()
set(LLDB_FRAMEWORK_VERSION A CACHE STRING "LLDB.framework version (default is A)")
set(LLDB_FRAMEWORK_BUILD_DIR bin CACHE STRING "Output directory for LLDB.framework")