Skip to content

Commit bce1b35

Browse files
committed
Updated cmake files to use print().
In these cases, just using print() is enough to ensure py2/3 compatibility.
1 parent fb9781b commit bce1b35

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

cmake/OpenCVDetectPython.cmake

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ if(PYTHON_EXECUTABLE)
4949

5050
if(NOT ANDROID AND NOT IOS)
5151
if(CMAKE_HOST_UNIX)
52-
execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import *; print get_python_lib()"
52+
execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import *; print(get_python_lib())"
5353
RESULT_VARIABLE PYTHON_CVPY_PROCESS
5454
OUTPUT_VARIABLE PYTHON_STD_PACKAGES_PATH
5555
OUTPUT_STRIP_TRAILING_WHITESPACE)
@@ -80,7 +80,7 @@ if(PYTHON_EXECUTABLE)
8080

8181
if(NOT PYTHON_NUMPY_INCLUDE_DIR)
8282
# Attempt to discover the NumPy include directory. If this succeeds, then build python API with NumPy
83-
execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "import os; os.environ['DISTUTILS_USE_SDK']='1'; import numpy.distutils; print numpy.distutils.misc_util.get_numpy_include_dirs()[0]"
83+
execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "import os; os.environ['DISTUTILS_USE_SDK']='1'; import numpy.distutils; print(numpy.distutils.misc_util.get_numpy_include_dirs()[0])"
8484
RESULT_VARIABLE PYTHON_NUMPY_PROCESS
8585
OUTPUT_VARIABLE PYTHON_NUMPY_INCLUDE_DIR
8686
OUTPUT_STRIP_TRAILING_WHITESPACE)
@@ -92,7 +92,7 @@ if(PYTHON_EXECUTABLE)
9292
endif()
9393

9494
if(PYTHON_NUMPY_INCLUDE_DIR)
95-
execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "import numpy; print numpy.version.version"
95+
execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "import numpy; print(numpy.version.version)"
9696
RESULT_VARIABLE PYTHON_NUMPY_PROCESS
9797
OUTPUT_VARIABLE PYTHON_NUMPY_VERSION
9898
OUTPUT_STRIP_TRAILING_WHITESPACE)

modules/python/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ else()
6767
endif()
6868
target_link_libraries(${the_module} ${OPENCV_MODULE_${the_module}_DEPS})
6969

70-
execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('SO')"
70+
execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('SO'))"
7171
RESULT_VARIABLE PYTHON_CVPY_PROCESS
7272
OUTPUT_VARIABLE CVPY_SUFFIX
7373
OUTPUT_STRIP_TRAILING_WHITESPACE)

0 commit comments

Comments
 (0)