File tree Expand file tree Collapse file tree 2 files changed +3
-21
lines changed Expand file tree Collapse file tree 2 files changed +3
-21
lines changed Original file line number Diff line number Diff line change 22# SPDX-License-Identifier: Apache-2.0
33
44# CMake functions for checking for Python packages
5- # Requires PYTHON_EXECUTABLE to be defined. Call FindPythonInterp first!
6-
7- # NOTE: if moving this file, be sure to also move python_packagecheck.py
8-
9- # must evaluate this now since CMAKE_CURRENT_LIST_DIR doesn't work in function scope
10- set (PYTHON_PACKAGECHECK_SCRIPT ${CMAKE_CURRENT_LIST_DIR} /python_packagecheck.py)
5+ # Requires PYTHON_EXECUTABLE to be defined. Call FindPython first!
116
127# set OUTPUT_VAR to whether PACKAGENAME was found
138function (check_python_package PACKAGENAME OUTPUT_VAR)
@@ -35,7 +30,7 @@ function(check_python_package PACKAGENAME OUTPUT_VAR)
3530 set (PY_INTERP_FOR_${OUTPUT_VAR} ${Python3_EXECUTABLE} CACHE INTERNAL "The python interpreter used to run the ${OUTPUT_VAR} check" FORCE)
3631
3732 execute_process (
38- COMMAND ${Python3_EXECUTABLE} ${PYTHON_PACKAGECHECK_SCRIPT} ${PACKAGENAME} RESULT_VARIABLE PACKAGECHECK_RESULT
33+ COMMAND ${Python3_EXECUTABLE} -c "import ${PACKAGENAME} " RESULT_VARIABLE PACKAGECHECK_RESULT
3934 )
4035
4136 if (${PACKAGECHECK_RESULT} EQUAL 0)
@@ -67,5 +62,5 @@ function(verify_python_package PACKAGENAME)
6762 if (NOT ${HAVE_VAR_NAME} )
6863 message (FATAL_ERROR "The required Python package ${PACKAGENAME} was not found in ${Python3_EXECUTABLE} . Please install it." )
6964 endif ()
70-
65+
7166endfunction (verify_python_package)
Load Diff This file was deleted.
You can’t perform that action at this time.
0 commit comments