Skip to content

Commit 7185e6e

Browse files
dneto0SjMxr233
authored andcommitted
CMake: Use find_package(Python3) (microsoft#6675)
Fixes the CMake CMP0148 warning at configure time. find_package(Python3) is supported since CMake 3.12, and DXC requires at least CMake 3.17
1 parent 0ca66e5 commit 7185e6e

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,7 @@ set(TARGET_TRIPLE "${LLVM_DEFAULT_TARGET_TRIPLE}")
447447
include(HandleLLVMOptions)
448448

449449
# Verify that we can find a Python 3 interpreter and force cmake to use it.
450-
find_package(PythonInterp 3 REQUIRED)
450+
find_package(Python3 REQUIRED)
451451

452452
######
453453
# LLVMBuild Integration
@@ -481,7 +481,7 @@ endif (LLVM_USE_OPROFILE)
481481
message(STATUS "Constructing LLVMBuild project information")
482482

483483
execute_process(
484-
COMMAND ${PYTHON_EXECUTABLE} ${LLVMBUILDTOOL}
484+
COMMAND ${Python3_EXECUTABLE} ${LLVMBUILDTOOL}
485485
--native-target Unknown
486486
--enable-targets "${LLVM_TARGETS_TO_BUILD}"
487487
--enable-optional-components "${LLVMOPTIONALCOMPONENTS}"

cmake/modules/AddLLVM.cmake

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
include(LLVMProcessSources)
22
include(LLVM-Config)
3+
find_package(Python3 REQUIRED)
34

45
function(llvm_update_compile_flags name)
56
get_property(sources TARGET ${name} PROPERTY SOURCES)
@@ -107,7 +108,7 @@ function(add_llvm_symbol_exports target_name export_file)
107108
set(native_export_file "${target_name}.def")
108109

109110
add_custom_command(OUTPUT ${native_export_file}
110-
COMMAND ${PYTHON_EXECUTABLE} -c "import sys;print(''.join(['EXPORTS\\n']+sys.stdin.readlines(),))"
111+
COMMAND ${Python3_EXECUTABLE} -c "import sys;print(''.join(['EXPORTS\\n']+sys.stdin.readlines(),))"
111112
< ${export_file} > ${native_export_file}
112113
DEPENDS ${export_file}
113114
VERBATIM
@@ -867,7 +868,6 @@ function(configure_lit_site_cfg input output)
867868
# SHLIBDIR points the build tree.
868869
string(REPLACE ${CMAKE_CFG_INTDIR} ${LLVM_BUILD_MODE} SHLIBDIR "${LLVM_SHLIB_OUTPUT_INTDIR}")
869870

870-
set(PYTHON_EXECUTABLE ${PYTHON_EXECUTABLE})
871871
# FIXME: "ENABLE_SHARED" doesn't make sense, since it is used just for
872872
# plugins. We may rename it.
873873
if(LLVM_ENABLE_PLUGINS)
@@ -902,7 +902,7 @@ function(add_lit_target target comment)
902902
list(APPEND LIT_ARGS --param build_mode=${CMAKE_CFG_INTDIR})
903903
endif ()
904904
if (LLVM_MAIN_SRC_DIR)
905-
set (LIT_COMMAND ${PYTHON_EXECUTABLE} ${LLVM_MAIN_SRC_DIR}/utils/lit/lit.py)
905+
set (LIT_COMMAND ${Python3_EXECUTABLE} ${LLVM_MAIN_SRC_DIR}/utils/lit/lit.py)
906906
else()
907907
find_program(LIT_COMMAND llvm-lit)
908908
endif ()

cmake/modules/HCT.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ function(add_hlsl_hctgen mode)
101101
endif()
102102

103103
add_custom_command(OUTPUT ${temp_output}
104-
COMMAND ${PYTHON_EXECUTABLE}
104+
COMMAND ${Python3_EXECUTABLE}
105105
${hctgen} ${force_lf}
106106
${mode} --output ${temp_output} ${input_flag}
107107
${format_cmd}

tools/clang/lib/Basic/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ if ( HLSL_SUPPORT_QUERY_GIT_COMMIT_INFO )
102102
set(GET_GIT_COMMIT_SCRIPT ${PROJECT_SOURCE_DIR}/utils/GetCommitInfo.py)
103103
add_custom_command(
104104
OUTPUT ${GIT_COMMIT_INFO_FILE}
105-
COMMAND ${PYTHON_EXECUTABLE} ${GET_GIT_COMMIT_SCRIPT}
105+
COMMAND ${Python3_EXECUTABLE} ${GET_GIT_COMMIT_SCRIPT}
106106
${PROJECT_SOURCE_DIR} ${GIT_COMMIT_INFO_FILE}
107107
DEPENDS ${GET_GIT_COMMIT_SCRIPT} GIT_COMMIT_INFO_ALWAYS_REBUILD
108108
COMMENT "Collect Git commit info for versioning"

utils/version/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ macro(generate_version_include name input_file output_file gen_flags)
66
add_custom_command(
77
OUTPUT ${gen_file}
88
COMMAND echo Generating version
9-
COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/gen_version.py ${gen_flags} > ${gen_file}
9+
COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/gen_version.py ${gen_flags} > ${gen_file}
1010
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/gen_version.py
1111
)
1212
else ()

0 commit comments

Comments
 (0)