ctetreau updated this revision to Diff 329965.
ctetreau added a comment.
This revision is now accepted and ready to land.
Only require if adding test suite targets
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D95635/new/
https://reviews.llvm.org/D95635
Files:
clang/CMakeLists.txt
lld/CMakeLists.txt
llvm/CMakeLists.txt
mlir/CMakeLists.txt
Index: mlir/CMakeLists.txt
===================================================================
--- mlir/CMakeLists.txt
+++ mlir/CMakeLists.txt
@@ -79,7 +79,12 @@
if(MLIR_BINDINGS_PYTHON_ENABLED)
include(MLIRDetectPythonEnv)
- find_package(Python3 COMPONENTS Interpreter Development NumPy REQUIRED)
+ if (LLVM_INCLUDE_TESTS)
+ # Test suite uses features of 3.6
+ find_package(Python3 3.6 COMPONENTS Interpreter Development NumPy REQUIRED)
+ else()
+ find_package(Python3 COMPONENTS Interpreter Development NumPy REQUIRED)
+ endif()
message(STATUS "Found python include dirs: ${Python3_INCLUDE_DIRS}")
message(STATUS "Found python libraries: ${Python3_LIBRARIES}")
message(STATUS "Found numpy v${Python3_NumPy_VERSION}:
${Python3_NumPy_INCLUDE_DIRS}")
Index: llvm/CMakeLists.txt
===================================================================
--- llvm/CMakeLists.txt
+++ llvm/CMakeLists.txt
@@ -697,7 +697,12 @@
include(HandleLLVMOptions)
-find_package(Python3 REQUIRED COMPONENTS Interpreter)
+if (LLVM_INCLUDE_TESTS)
+ # Test suite uses features of 3.6
+ find_package(Python3 3.6 REQUIRED COMPONENTS Interpreter)
+else()
+ find_package(Python3 REQUIRED COMPONENTS Interpreter)
+endif()
######
Index: lld/CMakeLists.txt
===================================================================
--- lld/CMakeLists.txt
+++ lld/CMakeLists.txt
@@ -57,7 +57,7 @@
include(CheckAtomic)
if(LLVM_INCLUDE_TESTS)
- find_package(Python3 REQUIRED COMPONENTS Interpreter)
+ find_package(Python3 3.6 REQUIRED COMPONENTS Interpreter)
# Check prebuilt llvm/utils.
if(EXISTS ${LLVM_TOOLS_BINARY_DIR}/FileCheck${CMAKE_EXECUTABLE_SUFFIX}
Index: clang/CMakeLists.txt
===================================================================
--- clang/CMakeLists.txt
+++ clang/CMakeLists.txt
@@ -131,7 +131,7 @@
set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY
${CMAKE_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX} )
if(LLVM_INCLUDE_TESTS)
- find_package(Python3 REQUIRED COMPONENTS Interpreter)
+ find_package(Python3 3.6 REQUIRED COMPONENTS Interpreter)
# Check prebuilt llvm/utils.
if(EXISTS ${LLVM_TOOLS_BINARY_DIR}/FileCheck${CMAKE_EXECUTABLE_SUFFIX}
Index: mlir/CMakeLists.txt
===================================================================
--- mlir/CMakeLists.txt
+++ mlir/CMakeLists.txt
@@ -79,7 +79,12 @@
if(MLIR_BINDINGS_PYTHON_ENABLED)
include(MLIRDetectPythonEnv)
- find_package(Python3 COMPONENTS Interpreter Development NumPy REQUIRED)
+ if (LLVM_INCLUDE_TESTS)
+ # Test suite uses features of 3.6
+ find_package(Python3 3.6 COMPONENTS Interpreter Development NumPy REQUIRED)
+ else()
+ find_package(Python3 COMPONENTS Interpreter Development NumPy REQUIRED)
+ endif()
message(STATUS "Found python include dirs: ${Python3_INCLUDE_DIRS}")
message(STATUS "Found python libraries: ${Python3_LIBRARIES}")
message(STATUS "Found numpy v${Python3_NumPy_VERSION}: ${Python3_NumPy_INCLUDE_DIRS}")
Index: llvm/CMakeLists.txt
===================================================================
--- llvm/CMakeLists.txt
+++ llvm/CMakeLists.txt
@@ -697,7 +697,12 @@
include(HandleLLVMOptions)
-find_package(Python3 REQUIRED COMPONENTS Interpreter)
+if (LLVM_INCLUDE_TESTS)
+ # Test suite uses features of 3.6
+ find_package(Python3 3.6 REQUIRED COMPONENTS Interpreter)
+else()
+ find_package(Python3 REQUIRED COMPONENTS Interpreter)
+endif()
######
Index: lld/CMakeLists.txt
===================================================================
--- lld/CMakeLists.txt
+++ lld/CMakeLists.txt
@@ -57,7 +57,7 @@
include(CheckAtomic)
if(LLVM_INCLUDE_TESTS)
- find_package(Python3 REQUIRED COMPONENTS Interpreter)
+ find_package(Python3 3.6 REQUIRED COMPONENTS Interpreter)
# Check prebuilt llvm/utils.
if(EXISTS ${LLVM_TOOLS_BINARY_DIR}/FileCheck${CMAKE_EXECUTABLE_SUFFIX}
Index: clang/CMakeLists.txt
===================================================================
--- clang/CMakeLists.txt
+++ clang/CMakeLists.txt
@@ -131,7 +131,7 @@
set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX} )
if(LLVM_INCLUDE_TESTS)
- find_package(Python3 REQUIRED COMPONENTS Interpreter)
+ find_package(Python3 3.6 REQUIRED COMPONENTS Interpreter)
# Check prebuilt llvm/utils.
if(EXISTS ${LLVM_TOOLS_BINARY_DIR}/FileCheck${CMAKE_EXECUTABLE_SUFFIX}
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
