Try to make sure we use the host's Python interpreter

dpogue · Nov 1, 2023 · 815c2a4 · 815c2a4
1 parent 55ba2ae
commit 815c2a4
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -132,6 +132,8 @@ elseif(WIN32)
     find_package(VLD)
 endif()
 
+find_program(HOST_Python3_EXECUTABLE python3 DOC "Path to (host) Python 3 Interpreter")
+
 include(PythonUtils)
 include(PlasmaTargets)
 

diff --git a/Sources/Plasma/Apps/plClient/CMakeLists.txt b/Sources/Plasma/Apps/plClient/CMakeLists.txt
@@ -22,7 +22,7 @@ python_test_modules(
     REQUIREMENTS_FILE "${CMAKE_CURRENT_SOURCE_DIR}/external/requirements.txt"
 )
 
-cmake_dependent_option(PLASMA_BUILD_RESOURCE_DAT "Do we want to build resource.dat?" ON "cairosvg_FOUND AND PIL_FOUND" OFF)
+cmake_dependent_option(PLASMA_BUILD_RESOURCE_DAT "Do we want to build resource.dat?" ON "cairosvg_FOUND AND PIL_FOUND AND HOST_Python3_EXECUTABLE" OFF)
 cmake_dependent_option(RESOURCE_OPTIMIZE "Optimize the images in resource.dat" ON "PLASMA_BUILD_RESOURCE_DAT AND PNGCRUSH_EXECUTABLE" OFF)
 cmake_dependent_option(RESOURCE_BRUTE "Allow pngcrush brute-force optimization" OFF "PLASMA_BUILD_RESOURCE_DAT AND PNGCRUSH_EXECUTABLE" OFF)
 
@@ -37,7 +37,7 @@ if(PLASMA_BUILD_RESOURCE_DAT)
 
     add_custom_command(
         OUTPUT ${external_DAT}
-        COMMAND "${Python3_EXECUTABLE}"
+        COMMAND "${HOST_Python3_EXECUTABLE}"
                 "${CMAKE_CURRENT_SOURCE_DIR}/external/makeres.py"
                 --render --package
                 ${OPTIMIZE_ARGUMENT}

diff --git a/cmake/PythonUtils.cmake b/cmake/PythonUtils.cmake
@@ -7,12 +7,16 @@ function(python_test_modules)
         message(FATAL_ERROR "python_test_modules() must be given a list of MODULES")
     endif()
 
+    if(NOT HOST_Python3_EXECUTABLE)
+        message(WARNING "No host Python interpreter")
+    endif()
+
     # Optional: attempt to install modules from pip before checking their existence.
-    if(ENABLE_PIP_INSTALL AND NOT _ptm_DONT_INSTALL)
+    if(HOST_Python3_EXECUTABLE AND ENABLE_PIP_INSTALL AND NOT _ptm_DONT_INSTALL)
         if(NOT _PLASMA_ENSUREPIP_DONE)
             message(STATUS "Bootstrapping pip...")
             execute_process(
-                COMMAND "${Python3_EXECUTABLE}" -m ensurepip
+                COMMAND "${HOST_Python3_EXECUTABLE}" -m ensurepip
                 RESULT_VARIABLE RETURNCODE
                 OUTPUT_QUIET ERROR_QUIET
             )
@@ -25,14 +29,14 @@ function(python_test_modules)
         if(_ptm_REQUIREMENTS_FILE)
             message(STATUS "Installing Python modules from: ${_ptm_REQUIREMENTS_FILE}")
             execute_process(
-                COMMAND "${Python3_EXECUTABLE}" -m pip install -r "${_ptm_REQUIREMENTS_FILE}"
+                COMMAND "${HOST_Python3_EXECUTABLE}" -m pip install -r "${_ptm_REQUIREMENTS_FILE}"
                 RESULT_VARIABLE RETURNCODE
                 OUTPUT_QUIET ERROR_QUIET
             )
         else()
             message(STATUS "Installing Python modules: ${_ptm_MODULES}")
             execute_process(
-                COMMAND "${Python3_EXECUTABLE}" -m pip install ${_ptm_MODULES}
+                COMMAND "${HOST_Python3_EXECUTABLE}" -m pip install ${_ptm_MODULES}
                 OUTPUT_QUIET ERROR_QUIET
             )
         endif()
@@ -43,9 +47,9 @@ function(python_test_modules)
     endif()
 
     foreach(_module_NAME IN LISTS _ptm_MODULES)
-        if(Python3_EXECUTABLE)
+        if(HOST_Python3_EXECUTABLE)
             execute_process(
-                COMMAND "${Python3_EXECUTABLE}" -c "import ${_module_NAME}"
+                COMMAND "${HOST_Python3_EXECUTABLE}" -c "import ${_module_NAME}"
                 RESULT_VARIABLE RETURNCODE
                 OUTPUT_QUIET ERROR_QUIET
             )