From 450b96510e2c6fd2921da1fe2893945c5234a54f Mon Sep 17 00:00:00 2001 From: cyy Date: Thu, 20 Feb 2020 11:08:04 +0800 Subject: [PATCH] fixes #16500 --- modules/python/package/template/config.py.in | 2 ++ modules/python/python_loader.cmake | 8 +++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/modules/python/package/template/config.py.in b/modules/python/package/template/config.py.in index 5fc444f175..7f18a920e0 100644 --- a/modules/python/package/template/config.py.in +++ b/modules/python/package/template/config.py.in @@ -1,3 +1,5 @@ +import os + BINARIES_PATHS = [ @CMAKE_PYTHON_BINARIES_PATH@ ] + BINARIES_PATHS diff --git a/modules/python/python_loader.cmake b/modules/python/python_loader.cmake index 663be5c824..31cd33505a 100644 --- a/modules/python/python_loader.cmake +++ b/modules/python/python_loader.cmake @@ -58,7 +58,13 @@ if(NOT OpenCV_FOUND) # Ignore "standalone" builds of Python bindings else() list(APPEND CMAKE_PYTHON_BINARIES_INSTALL_PATH "os.path.join(${CMAKE_PYTHON_EXTENSION_INSTALL_PATH_BASE}, '${OPENCV_LIB_INSTALL_PATH}')") endif() - string(REPLACE ";" ",\n " CMAKE_PYTHON_BINARIES_PATH "${CMAKE_PYTHON_BINARIES_INSTALL_PATH}") + set(CMAKE_PYTHON_BINARIES_PATH "${CMAKE_PYTHON_BINARIES_INSTALL_PATH}") + if (WIN32 AND HAVE_CUDA) + if (DEFINED CUDA_TOOLKIT_ROOT_DIR) + list(APPEND CMAKE_PYTHON_BINARIES_PATH "os.path.join(os.getenv('CUDA_PATH', '${CUDA_TOOLKIT_ROOT_DIR}'), 'bin')") + endif() + endif() + string(REPLACE ";" ",\n " CMAKE_PYTHON_BINARIES_PATH "${CMAKE_PYTHON_BINARIES_PATH}") configure_file("${PYTHON_SOURCE_DIR}/package/template/config.py.in" "${__python_loader_install_tmp_path}/cv2/config.py" @ONLY) install(FILES "${__python_loader_install_tmp_path}/cv2/config.py" DESTINATION "${OPENCV_PYTHON_INSTALL_PATH}/cv2/" COMPONENT python) endif()