Skip to content

Commit abaddbc

Browse files
authored
Merge pull request #4066 from antonio-rojas:fix-cudacodec-build
Fix cudacodec compilation with HAVE_NVCUVID=HAVE_NVCUVENC=OFF
2 parents b545e2f + 2ad4224 commit abaddbc

File tree

1 file changed

+15
-17
lines changed

1 file changed

+15
-17
lines changed

modules/cudacodec/CMakeLists.txt

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -30,25 +30,23 @@ if(WITH_NVCUVENC AND NOT HAVE_NVCUVENC)
3030
message(WARNING "cudacodec::VideoWriter requires Nvidia Video Codec SDK. Please resolve dependency or disable WITH_NVCUVENC=OFF")
3131
endif()
3232

33-
if(HAVE_NVCUVID OR HAVE_NVCUVENC)
34-
if(ENABLE_CUDA_FIRST_CLASS_LANGUAGE)
35-
list(APPEND extra_libs CUDA::cuda_driver CUDA::cudart${CUDA_LIB_EXT})
36-
else()
37-
list(APPEND extra_libs ${CUDA_CUDA_LIBRARY})
38-
endif()
39-
if(HAVE_NVCUVID)
40-
list(APPEND extra_libs ${CUDA_nvcuvid_LIBRARY})
41-
endif()
42-
if(HAVE_NVCUVENC)
43-
if(WIN32)
44-
list(APPEND extra_libs ${CUDA_nvencodeapi_LIBRARY})
45-
else()
46-
list(APPEND extra_libs ${CUDA_nvidia-encode_LIBRARY})
47-
endif()
48-
endif()
33+
if(ENABLE_CUDA_FIRST_CLASS_LANGUAGE)
34+
list(APPEND extra_libs CUDA::cuda_driver CUDA::cudart${CUDA_LIB_EXT})
35+
else()
36+
list(APPEND extra_libs ${CUDA_CUDA_LIBRARY})
37+
endif()
38+
if(HAVE_NVCUVID)
39+
list(APPEND extra_libs ${CUDA_nvcuvid_LIBRARY})
40+
endif()
41+
if(HAVE_NVCUVENC)
42+
if(WIN32)
43+
list(APPEND extra_libs ${CUDA_nvencodeapi_LIBRARY})
44+
else()
45+
list(APPEND extra_libs ${CUDA_nvidia-encode_LIBRARY})
46+
endif()
4947
endif()
5048

5149
ocv_create_module(${extra_libs})
5250

5351
ocv_add_accuracy_tests()
54-
ocv_add_perf_tests()
52+
ocv_add_perf_tests()

0 commit comments

Comments
 (0)