Commit 1dec4809 authored by Alexander Alekhin's avatar Alexander Alekhin

Merge pull request #11951 from alalek:cuda_use_external_cmake_module

parents d6c669f5 e79c729b
...@@ -8,14 +8,23 @@ if(NOT APPLE AND CV_CLANG) ...@@ -8,14 +8,23 @@ if(NOT APPLE AND CV_CLANG)
return() return()
endif() endif()
set(CMAKE_MODULE_PATH "${OpenCV_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
if(ANDROID) if(((NOT CMAKE_VERSION VERSION_LESS "3.9.0") # requires https://gitlab.kitware.com/cmake/cmake/merge_requests/663
set(CUDA_TARGET_OS_VARIANT "Android") OR OPENCV_CUDA_FORCE_EXTERNAL_CMAKE_MODULE)
endif() AND NOT OPENCV_CUDA_FORCE_BUILTIN_CMAKE_MODULE)
find_host_package(CUDA "${MIN_VER_CUDA}" QUIET) ocv_update(CUDA_LINK_LIBRARIES_KEYWORD "LINK_PRIVATE")
find_host_package(CUDA "${MIN_VER_CUDA}" QUIET)
else()
# Use OpenCV's patched "FindCUDA" module
set(CMAKE_MODULE_PATH "${OpenCV_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
if(ANDROID)
set(CUDA_TARGET_OS_VARIANT "Android")
endif()
find_host_package(CUDA "${MIN_VER_CUDA}" QUIET)
list(REMOVE_AT CMAKE_MODULE_PATH 0) list(REMOVE_AT CMAKE_MODULE_PATH 0)
endif()
if(CUDA_FOUND) if(CUDA_FOUND)
set(HAVE_CUDA 1) set(HAVE_CUDA 1)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment