This is an archive of the discontinued LLVM Phabricator instance.

Differential D87189

[CMake] Remove dead FindPythonInterp code
ClosedPublic

Authored by tambre on Sep 5 2020, 7:55 AM.

Details

Reviewers
compnerd
phosek
ldionne
Group Reviewers
Restricted Project
Commits
rG86bd8f82cc74: [CMake] Remove dead FindPythonInterp code
Summary

LLVM has bumped the minimum required CMake version to 3.13.4, so this has become dead code.

Diff Detail

Event Timeline

tambre created this revision.Sep 5 2020, 7:55 AM
Herald added projects: Restricted Project, Restricted Project, Restricted Project, Restricted Project. · View Herald TranscriptSep 5 2020, 7:55 AM
Herald added a reviewer: Restricted Project. · View Herald Transcript
Herald added subscribers: llvm-commits, libcxx-commits, Restricted Project and 2 others. · View Herald Transcript
tambre requested review of this revision.Sep 5 2020, 7:55 AM
Harbormaster completed remote builds in B70733: Diff 290088.Sep 5 2020, 8:25 AM
ldionne accepted this revision.Sep 8 2020, 4:50 AM
ldionne added a subscriber: ldionne.

I love this.

This revision is now accepted and ready to land.Sep 8 2020, 4:50 AM
Herald added a subscriber: dexonsmith. · View Herald TranscriptSep 8 2020, 4:50 AM
This revision was landed with ongoing or failed builds.Sep 8 2020, 5:23 AM
Closed by commit rG86bd8f82cc74: [CMake] Remove dead FindPythonInterp code (authored by tambre). · Explain Why
This revision was automatically updated to reflect the committed changes.
tambre added a commit: rG86bd8f82cc74: [CMake] Remove dead FindPythonInterp code.

Revision Contents

PathSize
clang/
37 lines
compiler-rt/
33 lines
libcxx/
36 lines
lld/
39 lines
llvm/
37 lines

Diff 290459

clang/CMakeLists.txt

Show First 20 Lines • Show All 130 Lines • ▼ Show 20 Linesif( CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR )
include_directories("${LLVM_BINARY_DIR}/include" "${LLVM_MAIN_INCLUDE_DIR}") include_directories("${LLVM_BINARY_DIR}/include" "${LLVM_MAIN_INCLUDE_DIR}")
link_directories("${LLVM_LIBRARY_DIR}") link_directories("${LLVM_LIBRARY_DIR}")
set( CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin ) set( CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin )
set( CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX} ) set( CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX} )
set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX} ) set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX} )
if(LLVM_INCLUDE_TESTS) if(LLVM_INCLUDE_TESTS)
if(CMAKE_VERSION VERSION_LESS 3.12)
include(FindPythonInterp)
if(NOT PYTHONINTERP_FOUND)
message(FATAL_ERROR
"Unable to find Python interpreter, required for builds and testing.
Please install Python or specify the PYTHON_EXECUTABLE CMake variable.")
endif()
if( ${PYTHON_VERSION_STRING} VERSION_LESS 2.7 )
message(FATAL_ERROR "Python 2.7 or newer is required")
endif()
add_executable(Python3::Interpreter IMPORTED)
set_target_properties(Python3::Interpreter PROPERTIES
IMPORTED_LOCATION ${PYTHON_EXECUTABLE})
set(Python3_EXECUTABLE ${PYTHON_EXECUTABLE})
else()
find_package(Python3 COMPONENTS Interpreter) find_package(Python3 COMPONENTS Interpreter)
if(NOT Python3_Interpreter_FOUND) if(NOT Python3_Interpreter_FOUND)
message(WARNING "Python3 not found, using python2 as a fallback") message(WARNING "Python3 not found, using python2 as a fallback")
find_package(Python2 COMPONENTS Interpreter REQUIRED) find_package(Python2 COMPONENTS Interpreter REQUIRED)
if(Python2_VERSION VERSION_LESS 2.7) if(Python2_VERSION VERSION_LESS 2.7)
message(SEND_ERROR "Python 2.7 or newer is required") message(SEND_ERROR "Python 2.7 or newer is required")
endif() endif()
# Treat python2 as python3 # Treat python2 as python3
add_executable(Python3::Interpreter IMPORTED) add_executable(Python3::Interpreter IMPORTED)
set_target_properties(Python3::Interpreter PROPERTIES set_target_properties(Python3::Interpreter PROPERTIES
IMPORTED_LOCATION ${Python2_EXECUTABLE}) IMPORTED_LOCATION ${Python2_EXECUTABLE})
set(Python3_EXECUTABLE ${Python2_EXECUTABLE}) set(Python3_EXECUTABLE ${Python2_EXECUTABLE})
endif() endif()
endif()
# Check prebuilt llvm/utils. # Check prebuilt llvm/utils.
if(EXISTS ${LLVM_TOOLS_BINARY_DIR}/FileCheck${CMAKE_EXECUTABLE_SUFFIX} if(EXISTS ${LLVM_TOOLS_BINARY_DIR}/FileCheck${CMAKE_EXECUTABLE_SUFFIX}
AND EXISTS ${LLVM_TOOLS_BINARY_DIR}/count${CMAKE_EXECUTABLE_SUFFIX} AND EXISTS ${LLVM_TOOLS_BINARY_DIR}/count${CMAKE_EXECUTABLE_SUFFIX}
AND EXISTS ${LLVM_TOOLS_BINARY_DIR}/not${CMAKE_EXECUTABLE_SUFFIX}) AND EXISTS ${LLVM_TOOLS_BINARY_DIR}/not${CMAKE_EXECUTABLE_SUFFIX})
set(LLVM_UTILS_PROVIDED ON) set(LLVM_UTILS_PROVIDED ON)
endif() endif()
▲ Show 20 Lines • Show All 736 Lines • Show Last 20 Lines

compiler-rt/CMakeLists.txt

Show First 20 Lines • Show All 75 Lines • ▼ Show 20 Lines
if (COMPILER_RT_STANDALONE_BUILD) if (COMPILER_RT_STANDALONE_BUILD)
load_llvm_config() load_llvm_config()
if (TARGET intrinsics_gen) if (TARGET intrinsics_gen)
# Loading the llvm config causes this target to be imported so place it # Loading the llvm config causes this target to be imported so place it
# under the appropriate folder in an IDE. # under the appropriate folder in an IDE.
set_target_properties(intrinsics_gen PROPERTIES FOLDER "Compiler-RT Misc") set_target_properties(intrinsics_gen PROPERTIES FOLDER "Compiler-RT Misc")
endif() endif()
if(CMAKE_VERSION VERSION_LESS 3.12)
# Find Python interpreter.
include(FindPythonInterp)
if(NOT PYTHONINTERP_FOUND)
message(FATAL_ERROR "
Unable to find Python interpreter required testing. Please install Python
or specify the PYTHON_EXECUTABLE CMake variable.")
endif()
add_executable(Python3::Interpreter IMPORTED)
set_target_properties(Python3::Interpreter PROPERTIES
IMPORTED_LOCATION ${PYTHON_EXECUTABLE})
set(Python3_EXECUTABLE ${PYTHON_EXECUTABLE})
else()
find_package(Python3 COMPONENTS Interpreter) find_package(Python3 COMPONENTS Interpreter)
if(NOT Python3_Interpreter_FOUND) if(NOT Python3_Interpreter_FOUND)
message(WARNING "Python3 not found, using python2 as a fallback") message(WARNING "Python3 not found, using python2 as a fallback")
find_package(Python2 COMPONENTS Interpreter REQUIRED) find_package(Python2 COMPONENTS Interpreter REQUIRED)
if(Python2_VERSION VERSION_LESS 2.7) if(Python2_VERSION VERSION_LESS 2.7)
message(SEND_ERROR "Python 2.7 or newer is required") message(SEND_ERROR "Python 2.7 or newer is required")
endif() endif()
# Treat python2 as python3 # Treat python2 as python3
add_executable(Python3::Interpreter IMPORTED) add_executable(Python3::Interpreter IMPORTED)
set_target_properties(Python3::Interpreter PROPERTIES set_target_properties(Python3::Interpreter PROPERTIES
IMPORTED_LOCATION ${Python2_EXECUTABLE}) IMPORTED_LOCATION ${Python2_EXECUTABLE})
set(Python3_EXECUTABLE ${Python2_EXECUTABLE}) set(Python3_EXECUTABLE ${Python2_EXECUTABLE})
endif() endif()
endif()
# Ensure that fat libraries are built correctly on Darwin # Ensure that fat libraries are built correctly on Darwin
if(APPLE) if(APPLE)
include(UseLibtool) include(UseLibtool)
endif() endif()
# Define default arguments to lit. # Define default arguments to lit.
set(LIT_ARGS_DEFAULT "-sv") set(LIT_ARGS_DEFAULT "-sv")
▲ Show 20 Lines • Show All 443 Lines • Show Last 20 Lines

libcxx/CMakeLists.txt

Show All 35 Linesif (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR OR LIBCXX_STANDALONE_BUILD)
set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}")
set(PACKAGE_BUGREPORT "llvm-bugs@lists.llvm.org") set(PACKAGE_BUGREPORT "llvm-bugs@lists.llvm.org")
# Find the LLVM sources and simulate LLVM CMake options. # Find the LLVM sources and simulate LLVM CMake options.
include(HandleOutOfTreeLLVM) include(HandleOutOfTreeLLVM)
endif() endif()
if (LIBCXX_STANDALONE_BUILD) if (LIBCXX_STANDALONE_BUILD)
if(CMAKE_VERSION VERSION_LESS 3.12)
include(FindPythonInterp)
if( NOT PYTHONINTERP_FOUND )
message(WARNING "Failed to find python interpreter. "
"The libc++ test suite will be disabled.")
set(LLVM_INCLUDE_TESTS OFF)
else()
add_executable(Python3::Interpreter IMPORTED)
set_target_properties(Python3::Interpreter PROPERTIES
IMPORTED_LOCATION ${PYTHON_EXECUTABLE})
set(Python3_EXECUTABLE ${PYTHON_EXECUTABLE})
endif()
else()
find_package(Python3 COMPONENTS Interpreter) find_package(Python3 COMPONENTS Interpreter)
if(NOT Python3_Interpreter_FOUND) if(NOT Python3_Interpreter_FOUND)
message(WARNING "Python3 not found, using python2 as a fallback") message(WARNING "Python3 not found, using python2 as a fallback")
find_package(Python2 COMPONENTS Interpreter REQUIRED) find_package(Python2 COMPONENTS Interpreter REQUIRED)
if(Python2_VERSION VERSION_LESS 2.7) if(Python2_VERSION VERSION_LESS 2.7)
message(SEND_ERROR "Python 2.7 or newer is required") message(SEND_ERROR "Python 2.7 or newer is required")
endif() endif()
# Treat python2 as python3 # Treat python2 as python3
add_executable(Python3::Interpreter IMPORTED) add_executable(Python3::Interpreter IMPORTED)
set_target_properties(Python3::Interpreter PROPERTIES set_target_properties(Python3::Interpreter PROPERTIES
IMPORTED_LOCATION ${Python2_EXECUTABLE}) IMPORTED_LOCATION ${Python2_EXECUTABLE})
set(Python3_EXECUTABLE ${Python2_EXECUTABLE}) set(Python3_EXECUTABLE ${Python2_EXECUTABLE})
endif() endif()
endif() endif()
endif()
# Require out of source build. # Require out of source build.
include(MacroEnsureOutOfSourceBuild) include(MacroEnsureOutOfSourceBuild)
MACRO_ENSURE_OUT_OF_SOURCE_BUILD( MACRO_ENSURE_OUT_OF_SOURCE_BUILD(
"${PROJECT_NAME} requires an out of source build. Please create a separate "${PROJECT_NAME} requires an out of source build. Please create a separate
build directory and run 'cmake /path/to/${PROJECT_NAME} [options]' there." build directory and run 'cmake /path/to/${PROJECT_NAME} [options]' there."
) )
if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" AND "${CMAKE_CXX_SIMULATE_ID}" STREQUAL "MSVC") if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" AND "${CMAKE_CXX_SIMULATE_ID}" STREQUAL "MSVC")
▲ Show 20 Lines • Show All 847 Lines • Show Last 20 Lines

lld/CMakeLists.txt

Show First 20 Lines • Show All 51 Lines • ▼ Show 20 Linesif(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
find_program(LLVM_TABLEGEN_EXE "llvm-tblgen" ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH) find_program(LLVM_TABLEGEN_EXE "llvm-tblgen" ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH)
include(AddLLVM) include(AddLLVM)
include(TableGen) include(TableGen)
include(HandleLLVMOptions) include(HandleLLVMOptions)
include(CheckAtomic) include(CheckAtomic)
if(LLVM_INCLUDE_TESTS) if(LLVM_INCLUDE_TESTS)
if(CMAKE_VERSION VERSION_LESS 3.12)
include(FindPythonInterp)
if(NOT PYTHONINTERP_FOUND)
message(FATAL_ERROR
"Unable to find Python interpreter, required for testing.
Please install Python or specify the PYTHON_EXECUTABLE CMake variable.")
endif()
if(${PYTHON_VERSION_STRING} VERSION_LESS 2.7)
message(FATAL_ERROR "Python 2.7 or newer is required")
endif()
add_executable(Python3::Interpeter IMPORTED)
set_target_properties(Python3::Interpreter PROPERTIES
IMPORTED_LOCATION ${PYTHON_EXECUTABLE})
set(Python3_EXECUTABLE ${PYTHON_EXECUTABLE})
else()
find_package(Python3 COMPONENTS Interpreter) find_package(Python3 COMPONENTS Interpreter)
if(NOT Python3_Interpreter_FOUND) if(NOT Python3_Interpreter_FOUND)
message(WARNING "Python3 not found, using python2 as a fallback") message(WARNING "Python3 not found, using python2 as a fallback")
find_package(Python2 COMPONENTS Interpreter REQUIRED) find_package(Python2 COMPONENTS Interpreter REQUIRED)
if(Python2_VERSION VERSION_LESS 2.7) if(Python2_VERSION VERSION_LESS 2.7)
message(SEND_ERROR "Python 2.7 or newer is required") message(SEND_ERROR "Python 2.7 or newer is required")
endif() endif()
# Treat python2 as python3 # Treat python2 as python3
add_executable(Python3::Interpreter IMPORTED) add_executable(Python3::Interpreter IMPORTED)
set_target_properties(Python3::Interpreter PROPERTIES set_target_properties(Python3::Interpreter PROPERTIES
IMPORTED_LOCATION ${Python2_EXECUTABLE}) IMPORTED_LOCATION ${Python2_EXECUTABLE})
set(Python3_EXECUTABLE ${Python2_EXECUTABLE}) set(Python3_EXECUTABLE ${Python2_EXECUTABLE})
endif() endif()
endif()
# Check prebuilt llvm/utils. # Check prebuilt llvm/utils.
if(EXISTS ${LLVM_TOOLS_BINARY_DIR}/FileCheck${CMAKE_EXECUTABLE_SUFFIX} if(EXISTS ${LLVM_TOOLS_BINARY_DIR}/FileCheck${CMAKE_EXECUTABLE_SUFFIX}
AND EXISTS ${LLVM_TOOLS_BINARY_DIR}/not${CMAKE_EXECUTABLE_SUFFIX}) AND EXISTS ${LLVM_TOOLS_BINARY_DIR}/not${CMAKE_EXECUTABLE_SUFFIX})
set(LLVM_UTILS_PROVIDED ON) set(LLVM_UTILS_PROVIDED ON)
endif() endif()
if(EXISTS ${LLVM_MAIN_SRC_DIR}/utils/lit/lit.py) if(EXISTS ${LLVM_MAIN_SRC_DIR}/utils/lit/lit.py)
▲ Show 20 Lines • Show All 131 Lines • Show Last 20 Lines

llvm/CMakeLists.txt

Show First 20 Lines • Show All 690 Lines • ▼ Show 20 Linesif(WIN32 OR CYGWIN)
endif() endif()
else() else()
set(LLVM_ENABLE_PLUGINS_default ${LLVM_ENABLE_PIC}) set(LLVM_ENABLE_PLUGINS_default ${LLVM_ENABLE_PIC})
endif() endif()
option(LLVM_ENABLE_PLUGINS "Enable plugin support" ${LLVM_ENABLE_PLUGINS_default}) option(LLVM_ENABLE_PLUGINS "Enable plugin support" ${LLVM_ENABLE_PLUGINS_default})
include(HandleLLVMOptions) include(HandleLLVMOptions)
if(CMAKE_VERSION VERSION_LESS 3.12)
include(FindPythonInterp)
if( NOT PYTHONINTERP_FOUND )
message(FATAL_ERROR
"Unable to find Python interpreter, required for builds and testing.
Please install Python or specify the PYTHON_EXECUTABLE CMake variable.")
endif()
if( ${PYTHON_VERSION_STRING} VERSION_LESS 2.7 )
message(FATAL_ERROR "Python 2.7 or newer is required")
endif()
add_executable(Python3::Interpreter IMPORTED)
set_target_properties(Python3::Interpreter PROPERTIES
IMPORTED_LOCATION ${PYTHON_EXECUTABLE})
set(Python3_EXECUTABLE ${PYTHON_EXECUTABLE})
else()
find_package(Python3 COMPONENTS Interpreter) find_package(Python3 COMPONENTS Interpreter)
if(NOT Python3_Interpreter_FOUND) if(NOT Python3_Interpreter_FOUND)
message(WARNING "Python3 not found, using python2 as a fallback") message(WARNING "Python3 not found, using python2 as a fallback")
find_package(Python2 COMPONENTS Interpreter REQUIRED) find_package(Python2 COMPONENTS Interpreter REQUIRED)
if(Python2_VERSION VERSION_LESS 2.7) if(Python2_VERSION VERSION_LESS 2.7)
message(SEND_ERROR "Python 2.7 or newer is required") message(SEND_ERROR "Python 2.7 or newer is required")
endif() endif()
# Treat python2 as python3 # Treat python2 as python3
add_executable(Python3::Interpreter IMPORTED) add_executable(Python3::Interpreter IMPORTED)
set_target_properties(Python3::Interpreter PROPERTIES set_target_properties(Python3::Interpreter PROPERTIES
IMPORTED_LOCATION ${Python2_EXECUTABLE}) IMPORTED_LOCATION ${Python2_EXECUTABLE})
set(Python3_EXECUTABLE ${Python2_EXECUTABLE}) set(Python3_EXECUTABLE ${Python2_EXECUTABLE})
endif() endif()
endif()
###### ######
# LLVMBuild Integration # LLVMBuild Integration
# #
# We use llvm-build to generate all the data required by the CMake based # We use llvm-build to generate all the data required by the CMake based
# build system in one swoop: # build system in one swoop:
# #
# - We generate a file (a CMake fragment) in the object root which contains # - We generate a file (a CMake fragment) in the object root which contains
▲ Show 20 Lines • Show All 482 Lines • Show Last 20 Lines