From 417f46174c1f7c372cf8696006636be3df11f500 Mon Sep 17 00:00:00 2001 From: Mark Rowe Date: Sun, 21 Dec 2025 22:05:27 -0800 Subject: [PATCH] Use CMake to find the Python interpreter to use when running scripts This makes it easier to control which interpreter is used, rather than always using python3 from PATH. --- arch/x86/CMakeLists.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/x86/CMakeLists.txt b/arch/x86/CMakeLists.txt index 70dd24cb08..75a96ba4a4 100644 --- a/arch/x86/CMakeLists.txt +++ b/arch/x86/CMakeLists.txt @@ -2,6 +2,8 @@ cmake_minimum_required(VERSION 3.15 FATAL_ERROR) project(arch_x86) +find_package(Python3 COMPONENTS Interpreter REQUIRED) + OPTION(BUILD_SHARED_LIBS "Build shared libraries" OFF) OPTION(YASM_BUILD_TESTS "Enable building of tests" OFF) add_subdirectory(yasm) @@ -9,10 +11,10 @@ add_subdirectory(yasm) set(XED_CONFIGURE_ARGS --no-encoder just-gen) if(WIN32) execute_process(COMMAND ${CMAKE_COMMAND} -E env OS=Windows_NT PYTHONPATH=${PROJECT_SOURCE_DIR}/mbuild - py -3 ${PROJECT_SOURCE_DIR}/xed/mfile.py ${XED_CONFIGURE_ARGS} + ${Python3_EXECUTABLE} ${PROJECT_SOURCE_DIR}/xed/mfile.py ${XED_CONFIGURE_ARGS} WORKING_DIRECTORY ${PROJECT_BINARY_DIR}) else() - execute_process(COMMAND python3 ${PROJECT_SOURCE_DIR}/xed/mfile.py ${XED_CONFIGURE_ARGS} + execute_process(COMMAND ${Python3_EXECUTABLE} ${PROJECT_SOURCE_DIR}/xed/mfile.py ${XED_CONFIGURE_ARGS} WORKING_DIRECTORY ${PROJECT_BINARY_DIR}) endif()