mirror of
https://github.com/JesseTG/melonds-ds.git
synced 2025-02-17 04:39:14 +00:00
Fix FindPythonModules's use of print
- Compatibility with Python 2 is no longer an issue
This commit is contained in:
parent
482143b642
commit
b7f8348ac7
@ -188,7 +188,7 @@ function (basis_find_python_module CACHEVAR)
|
||||
set (IMPORT_SITE_ERROR FALSE)
|
||||
# 2a. try it with -E option -- the preferred way to run Python
|
||||
execute_process (
|
||||
COMMAND "${ARGN_PYTHON_EXECUTABLE}" -E -c "import ${ARGN_NAME}; print ${ARGN_NAME}.__file__"
|
||||
COMMAND "${ARGN_PYTHON_EXECUTABLE}" -E -c "import ${ARGN_NAME}; print(${ARGN_NAME}.__file__)"
|
||||
RESULT_VARIABLE STATUS
|
||||
OUTPUT_VARIABLE P
|
||||
ERROR_VARIABLE ERROR
|
||||
@ -200,7 +200,7 @@ function (basis_find_python_module CACHEVAR)
|
||||
# 2b. try it without -E option
|
||||
if (NOT STATUS EQUAL 0)
|
||||
execute_process (
|
||||
COMMAND "${ARGN_PYTHON_EXECUTABLE}" -c "import ${ARGN_NAME}; print ${ARGN_NAME}.__file__"
|
||||
COMMAND "${ARGN_PYTHON_EXECUTABLE}" -c "import ${ARGN_NAME}; print(${ARGN_NAME}.__file__)"
|
||||
RESULT_VARIABLE STATUS
|
||||
OUTPUT_VARIABLE P
|
||||
ERROR_VARIABLE ERROR
|
||||
@ -213,7 +213,7 @@ function (basis_find_python_module CACHEVAR)
|
||||
set (PYTHONHOME "$ENV{PYTHONHOME}")
|
||||
unset (ENV{PYTHONHOME})
|
||||
execute_process (
|
||||
COMMAND "${ARGN_PYTHON_EXECUTABLE}" -c "import ${ARGN_NAME}; print ${ARGN_NAME}.__file__"
|
||||
COMMAND "${ARGN_PYTHON_EXECUTABLE}" -c "import ${ARGN_NAME}; print(${ARGN_NAME}.__file__)"
|
||||
RESULT_VARIABLE STATUS
|
||||
OUTPUT_VARIABLE P
|
||||
ERROR_VARIABLE ERROR
|
||||
|
Loading…
x
Reference in New Issue
Block a user