646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
28 lines
1.6 KiB
Diff
28 lines
1.6 KiB
Diff
diff --unified --recursive --text a/opencv_contrib/cudaoptflow/CMakeLists.txt b/opencv_contrib/cudaoptflow/CMakeLists.txt
|
|
--- a/opencv_contrib/cudaoptflow/CMakeLists.txt 2021-06-12 01:35:47.536395972 +0300
|
|
+++ b/opencv_contrib/cudaoptflow/CMakeLists.txt 2021-06-12 01:36:02.029498597 +0300
|
|
@@ -12,19 +12,6 @@
|
|
set(NVIDIA_OPTICAL_FLOW_2_0_HEADERS_COMMIT "edb50da3cf849840d680249aa6dbef248ebce2ca")
|
|
set(NVIDIA_OPTICAL_FLOW_2_0_HEADERS_MD5 "a73cd48b18dcc0cc8933b30796074191")
|
|
set(NVIDIA_OPTICAL_FLOW_2_0_HEADERS_PATH "${OpenCV_BINARY_DIR}/3rdparty/NVIDIAOpticalFlowSDK_2_0_Headers")
|
|
- ocv_download(FILENAME "${NVIDIA_OPTICAL_FLOW_2_0_HEADERS_COMMIT}.zip"
|
|
- HASH ${NVIDIA_OPTICAL_FLOW_2_0_HEADERS_MD5}
|
|
- URL "https://github.com/NVIDIA/NVIDIAOpticalFlowSDK/archive/"
|
|
- DESTINATION_DIR "${NVIDIA_OPTICAL_FLOW_2_0_HEADERS_PATH}"
|
|
- STATUS NVIDIA_OPTICAL_FLOW_2_0_HEADERS_DOWNLOAD_SUCCESS
|
|
- ID "NVIDIA_OPTICAL_FLOW"
|
|
- UNPACK RELATIVE_URL)
|
|
-
|
|
- if(NOT NVIDIA_OPTICAL_FLOW_2_0_HEADERS_DOWNLOAD_SUCCESS)
|
|
- message(STATUS "Failed to download NVIDIA_Optical_Flow_2_0 Headers")
|
|
- else()
|
|
- message(STATUS "Building with NVIDIA Optical Flow API 2.0")
|
|
- add_definitions(-DHAVE_NVIDIA_OPTFLOW=2)
|
|
- ocv_include_directories(SYSTEM "${NVIDIA_OPTICAL_FLOW_2_0_HEADERS_PATH}/NVIDIAOpticalFlowSDK-${NVIDIA_OPTICAL_FLOW_2_0_HEADERS_COMMIT}")
|
|
- endif()
|
|
-endif()
|
|
\ No newline at end of file
|
|
+ add_definitions(-DHAVE_NVIDIA_OPTFLOW=2)
|
|
+ ocv_include_directories(SYSTEM "${NVIDIA_OPTICAL_FLOW_2_0_HEADERS_PATH}")
|
|
+endif()
|