mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-27 13:29:00 +08:00
7a0c97b6b3
* [OpenCV2] add library for older C projects * [OpenCV2] fixes for non-Windows systems * [OpenCV2] add warnings for Ubuntu * add fixes for cuda * [OpenCV2] disable parallel building, otherwise cuda fails * [OpenCV2] refresh port with latest fixes * [OpenCV2] fix CONTROL * [OpenCV2] fixes for windows * [OpenCV2] fixes to avoid unnecessary install of pre-built ffmpeg, since it already uses externally provided one * [OpenCV2] openexr still has some problems, explicitly removed UWP support * [OpenCV2] use targets wherever possible. Jasper and OpenEXR features would require improvements in those ports, in order for them to provide targets too * [OpenCV2] re-enable parallel build also with CUDA * [OpenCV2] improve compatibility with CUDA 10+ * [OpenCV2] fix broken CUDA targets * [darknet] enable opencv2 feature * skip from building, like opencv3, to avoid problems in CI
139 lines
4.9 KiB
Diff
139 lines
4.9 KiB
Diff
--- a/cmake/OpenCVDetectCUDA.cmake
|
|
+++ b/cmake/OpenCVDetectCUDA.cmake
|
|
@@ -51,7 +51,7 @@ if(CUDA_FOUND)
|
|
|
|
message(STATUS "CUDA detected: " ${CUDA_VERSION})
|
|
|
|
- set(_generations "Fermi" "Kepler")
|
|
+ set(_generations "Kepler" "Maxwell")
|
|
if(NOT CMAKE_CROSSCOMPILING)
|
|
list(APPEND _generations "Auto")
|
|
endif()
|
|
@@ -70,14 +70,10 @@ if(CUDA_FOUND)
|
|
endif()
|
|
|
|
set(__cuda_arch_ptx "")
|
|
- if(CUDA_GENERATION STREQUAL "Fermi")
|
|
- set(__cuda_arch_bin "2.0 2.1(2.0)")
|
|
- elseif(CUDA_GENERATION STREQUAL "Kepler")
|
|
- if(${CUDA_VERSION} VERSION_LESS "5.0")
|
|
- set(__cuda_arch_bin "3.0")
|
|
- else()
|
|
- set(__cuda_arch_bin "3.0 3.5")
|
|
- endif()
|
|
+ if(CUDA_GENERATION STREQUAL "Kepler")
|
|
+ set(__cuda_arch_bin "3.0 3.5 3.7")
|
|
+ elseif(CUDA_GENERATION STREQUAL "Maxwell")
|
|
+ set(__cuda_arch_bin "5.0 5.2")
|
|
elseif(CUDA_GENERATION STREQUAL "Auto")
|
|
execute_process( COMMAND "${CUDA_NVCC_EXECUTABLE}" "${OpenCV_SOURCE_DIR}/cmake/checks/OpenCVDetectCudaArch.cu" "--run"
|
|
WORKING_DIRECTORY "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/"
|
|
@@ -87,7 +83,6 @@ if(CUDA_FOUND)
|
|
message(STATUS "Automatic detection of CUDA generation failed. Going to build for all known architectures.")
|
|
else()
|
|
set(__cuda_arch_bin "${_nvcc_out}")
|
|
- string(REPLACE "2.1" "2.1(2.0)" __cuda_arch_bin "${__cuda_arch_bin}")
|
|
endif()
|
|
endif()
|
|
|
|
@@ -102,11 +97,11 @@ if(CUDA_FOUND)
|
|
endif()
|
|
else()
|
|
if(${CUDA_VERSION} VERSION_LESS "5.0")
|
|
- set(__cuda_arch_bin "1.1 1.2 1.3 2.0 2.1(2.0) 3.0")
|
|
+ set(__cuda_arch_bin "3.0")
|
|
elseif(${CUDA_VERSION} VERSION_GREATER "6.5")
|
|
- set(__cuda_arch_bin "2.0 2.1(2.0) 3.0 3.5")
|
|
+ set(__cuda_arch_bin "3.0 3.5")
|
|
else()
|
|
- set(__cuda_arch_bin "1.1 1.2 1.3 2.0 2.1(2.0) 3.0 3.5")
|
|
+ set(__cuda_arch_bin "3.0 3.5")
|
|
endif()
|
|
set(__cuda_arch_ptx "3.0")
|
|
endif()
|
|
diff --git a/cmake/templates/OpenCVConfig.cmake.in b/cmake/templates/OpenCVConfig.cmake.in
|
|
index fe85571..0f9d2f5 100644
|
|
--- a/cmake/templates/OpenCVConfig.cmake.in
|
|
+++ b/cmake/templates/OpenCVConfig.cmake.in
|
|
@@ -256,7 +256,7 @@ if(OpenCV_CUDA_VERSION)
|
|
|
|
set(OpenCV_CUDA_LIBS_ABSPATH ${CUDA_LIBRARIES})
|
|
|
|
- if(${CUDA_VERSION} VERSION_LESS "5.5")
|
|
+ if(CUDA_VERSION VERSION_LESS "5.5")
|
|
list(APPEND OpenCV_CUDA_LIBS_ABSPATH ${CUDA_npp_LIBRARY})
|
|
else()
|
|
find_cuda_helper_libs(nppc)
|
|
@@ -281,14 +281,16 @@ if(OpenCV_CUDA_VERSION)
|
|
list(APPEND OpenCV_CUDA_LIBS_ABSPATH ${CUDA_nvcuvenc_LIBRARIES})
|
|
endif()
|
|
|
|
+ set(OpenCV_CUDA_LIBS_RELPATH "")
|
|
foreach(l ${OpenCV_CUDA_LIBS_ABSPATH})
|
|
- get_filename_component(_tmp "${l}" NAME_WE)
|
|
- string(REGEX REPLACE "^lib" "" _tmp "${_tmp}")
|
|
- if(NOT TARGET "opencv_dep_${_tmp}") # protect against repeated inclusions
|
|
- add_library("opencv_dep_${_tmp}" UNKNOWN IMPORTED)
|
|
- set_target_properties("opencv_dep_${_tmp}" PROPERTIES IMPORTED_LOCATION "${l}")
|
|
+ get_filename_component(_tmp ${l} PATH)
|
|
+ if(NOT ${_tmp} MATCHES "-Wl.*")
|
|
+ list(APPEND OpenCV_CUDA_LIBS_RELPATH ${_tmp})
|
|
endif()
|
|
endforeach()
|
|
+
|
|
+ list(REMOVE_DUPLICATES OpenCV_CUDA_LIBS_RELPATH)
|
|
+ link_directories(${OpenCV_CUDA_LIBS_RELPATH})
|
|
endif()
|
|
|
|
# ==============================================================
|
|
diff --git a/cmake/OpenCVDetectCUDA.cmake b/cmake/OpenCVDetectCUDA.cmake
|
|
index 30b5093..50dcdc9 100644
|
|
--- a/cmake/OpenCVDetectCUDA.cmake
|
|
+++ b/cmake/OpenCVDetectCUDA.cmake
|
|
@@ -229,18 +229,40 @@ else()
|
|
endif()
|
|
|
|
if(HAVE_CUDA)
|
|
+ set(CUDA_LIBS_PATH "")
|
|
+ foreach(p ${CUDA_LIBRARIES} ${CUDA_npp_LIBRARY})
|
|
+ get_filename_component(_tmp ${p} PATH)
|
|
+ list(APPEND CUDA_LIBS_PATH ${_tmp})
|
|
+ endforeach()
|
|
+
|
|
+ if(HAVE_CUBLAS)
|
|
+ foreach(p ${CUDA_cublas_LIBRARY})
|
|
+ get_filename_component(_tmp ${p} PATH)
|
|
+ list(APPEND CUDA_LIBS_PATH ${_tmp})
|
|
+ endforeach()
|
|
+ endif()
|
|
+
|
|
+ if(HAVE_CUFFT)
|
|
+ foreach(p ${CUDA_cufft_LIBRARY})
|
|
+ get_filename_component(_tmp ${p} PATH)
|
|
+ list(APPEND CUDA_LIBS_PATH ${_tmp})
|
|
+ endforeach()
|
|
+ endif()
|
|
+
|
|
+ list(REMOVE_DUPLICATES CUDA_LIBS_PATH)
|
|
+ link_directories(${CUDA_LIBS_PATH})
|
|
+
|
|
set(CUDA_LIBRARIES_ABS ${CUDA_LIBRARIES})
|
|
- ocv_create_imported_targets(CUDA_LIBRARIES ${CUDA_LIBRARIES})
|
|
+ ocv_convert_to_lib_name(CUDA_LIBRARIES ${CUDA_LIBRARIES})
|
|
set(CUDA_npp_LIBRARY_ABS ${CUDA_npp_LIBRARY})
|
|
- ocv_create_imported_targets(CUDA_npp_LIBRARY ${CUDA_npp_LIBRARY})
|
|
-
|
|
+ ocv_convert_to_lib_name(CUDA_npp_LIBRARY ${CUDA_npp_LIBRARY})
|
|
if(HAVE_CUBLAS)
|
|
set(CUDA_cublas_LIBRARY_ABS ${CUDA_cublas_LIBRARY})
|
|
- ocv_create_imported_targets(CUDA_cublas_LIBRARY ${CUDA_cublas_LIBRARY})
|
|
+ ocv_convert_to_lib_name(CUDA_cublas_LIBRARY ${CUDA_cublas_LIBRARY})
|
|
endif()
|
|
|
|
if(HAVE_CUFFT)
|
|
set(CUDA_cufft_LIBRARY_ABS ${CUDA_cufft_LIBRARY})
|
|
- ocv_create_imported_targets(CUDA_cufft_LIBRARY ${CUDA_cufft_LIBRARY})
|
|
+ ocv_convert_to_lib_name(CUDA_cufft_LIBRARY ${CUDA_cufft_LIBRARY})
|
|
endif()
|
|
endif()
|