mirror of
https://github.com/opencv/opencv.git
synced 2025-08-05 14:06:35 +08:00
Merge pull request #10954 from whizzzkid:master
This commit is contained in:
commit
ec0bb66e5e
@ -50,6 +50,9 @@ endif()
|
|||||||
foreach(sample_filename ${all_samples})
|
foreach(sample_filename ${all_samples})
|
||||||
ocv_define_sample(tgt ${sample_filename} gpu)
|
ocv_define_sample(tgt ${sample_filename} gpu)
|
||||||
ocv_target_link_libraries(${tgt} ${OPENCV_LINKER_LIBS} ${OPENCV_CUDA_SAMPLES_REQUIRED_DEPS})
|
ocv_target_link_libraries(${tgt} ${OPENCV_LINKER_LIBS} ${OPENCV_CUDA_SAMPLES_REQUIRED_DEPS})
|
||||||
|
if(HAVE_CUDA AND NOT ANDROID)
|
||||||
|
ocv_target_link_libraries(${tgt} ${CUDA_CUDA_LIBRARY})
|
||||||
|
endif()
|
||||||
if(HAVE_opencv_xfeatures2d)
|
if(HAVE_opencv_xfeatures2d)
|
||||||
ocv_target_link_libraries(${tgt} opencv_xfeatures2d)
|
ocv_target_link_libraries(${tgt} opencv_xfeatures2d)
|
||||||
endif()
|
endif()
|
||||||
|
Loading…
Reference in New Issue
Block a user