mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-08-01 02:18:01 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #22880 from cudawarped:remember_cudacodec_lib_locations

Browse Source 
Prevent cudacodec libs locations being reset when cmake is re-run
This commit is contained in:
Alexander Smorkalov 2022-12-16 12:30:03 +03:00 committed by GitHub
commit 6db9fcbc30
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -263,10 +263,10 @@ OCV_OPTION(WITH_CUBLAS "Include NVidia Cuda Basic Linear Algebra Subprograms (BL
OCV_OPTION(WITH_CUDNN "Include NVIDIA CUDA Deep Neural Network (cuDNN) library support" WITH_CUDA OCV_OPTION(WITH_CUDNN "Include NVIDIA CUDA Deep Neural Network (cuDNN) library support" WITH_CUDA
VISIBLE_IF WITH_CUDA VISIBLE_IF WITH_CUDA
VERIFY HAVE_CUDNN) VERIFY HAVE_CUDNN)
OCV_OPTION(WITH_NVCUVID "Include NVidia Video Decoding library support" OFF # disabled, details: https://github.com/opencv/opencv/issues/14850 OCV_OPTION(WITH_NVCUVID "Include NVidia Video Decoding library support" ON
VISIBLE_IF WITH_CUDA VISIBLE_IF WITH_CUDA
VERIFY HAVE_NVCUVID) VERIFY HAVE_NVCUVID)
OCV_OPTION(WITH_NVCUVENC "Include NVidia Video Encoding library support" OFF OCV_OPTION(WITH_NVCUVENC "Include NVidia Video Encoding library support" ON
VISIBLE_IF WITH_CUDA VISIBLE_IF WITH_CUDA
VERIFY HAVE_NVCUVENC) VERIFY HAVE_NVCUVENC)
OCV_OPTION(WITH_EIGEN "Include Eigen2/Eigen3 support" (NOT CV_DISABLE_OPTIMIZATION AND NOT CMAKE_CROSSCOMPILING) OCV_OPTION(WITH_EIGEN "Include Eigen2/Eigen3 support" (NOT CV_DISABLE_OPTIMIZATION AND NOT CMAKE_CROSSCOMPILING)

4
cmake/OpenCVDetectCUDA.cmake
View File

@ -10,6 +10,10 @@ endif()
#set(OPENCV_CMAKE_CUDA_DEBUG 1) #set(OPENCV_CMAKE_CUDA_DEBUG 1)
if(CUDA_TOOLKIT_ROOT_DIR)
set(CUDA_TOOLKIT_TARGET_DIR ${CUDA_TOOLKIT_ROOT_DIR})
endif()
if(((NOT CMAKE_VERSION VERSION_LESS "3.9.0") # requires https://gitlab.kitware.com/cmake/cmake/merge_requests/663 if(((NOT CMAKE_VERSION VERSION_LESS "3.9.0") # requires https://gitlab.kitware.com/cmake/cmake/merge_requests/663
OR OPENCV_CUDA_FORCE_EXTERNAL_CMAKE_MODULE) OR OPENCV_CUDA_FORCE_EXTERNAL_CMAKE_MODULE)
AND NOT OPENCV_CUDA_FORCE_BUILTIN_CMAKE_MODULE) AND NOT OPENCV_CUDA_FORCE_BUILTIN_CMAKE_MODULE)