Commit 18f1c023 authored by Alexander Alekhin's avatar Alexander Alekhin

Merge moved code from opencv/3.4

parents b11fb781 aaf67d6f
...@@ -16,7 +16,7 @@ if(OCV_DEPENDENCIES_FOUND) ...@@ -16,7 +16,7 @@ if(OCV_DEPENDENCIES_FOUND)
ocv_cuda_filter_options() ocv_cuda_filter_options()
CUDA_ADD_EXECUTABLE(${the_target} ${OPENCV_TEST_${the_module}_SOURCES} OPTIONS -std=c++11) CUDA_ADD_EXECUTABLE(${the_target} ${OPENCV_TEST_${the_module}_SOURCES} OPTIONS -std=c++11)
ocv_target_link_libraries(${the_target} LINK_PRIVATE ocv_target_link_libraries(${the_target} PRIVATE
${test_deps} ${OPENCV_LINKER_LIBS} ${CUDA_LIBRARIES} ${test_deps} ${OPENCV_LINKER_LIBS} ${CUDA_LIBRARIES}
) )
add_dependencies(opencv_tests ${the_target}) add_dependencies(opencv_tests ${the_target})
......
...@@ -35,10 +35,10 @@ ocv_add_accuracy_tests() ...@@ -35,10 +35,10 @@ ocv_add_accuracy_tests()
ocv_add_perf_tests() ocv_add_perf_tests()
ocv_add_samples(opencv_imgproc opencv_calib3d opencv_features2d opencv_flann) ocv_add_samples(opencv_imgproc opencv_calib3d opencv_features2d opencv_flann)
ocv_target_link_libraries(${the_module} LINK_PRIVATE ${VTK_LIBRARIES}) ocv_target_link_libraries(${the_module} PRIVATE ${VTK_LIBRARIES})
if(APPLE AND BUILD_opencv_viz) if(APPLE AND BUILD_opencv_viz)
ocv_target_link_libraries(${the_module} LINK_PRIVATE "-framework Cocoa") ocv_target_link_libraries(${the_module} PRIVATE "-framework Cocoa")
endif() endif()
if(TARGET opencv_test_viz) if(TARGET opencv_test_viz)
......
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