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

Merge moved code from opencv/3.4

parents b11fb781 aaf67d6f

modules/cudev/test/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ if(OCV_DEPENDENCIES_FOUND) 
  ocv_cuda_filter_options()



  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}

  )

  add_dependencies(opencv_tests ${the_target})

modules/viz/CMakeLists.txt

+2 −2
Original line number Diff line number Diff line
@@ -35,10 +35,10 @@ ocv_add_accuracy_tests() 
ocv_add_perf_tests()

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)

  ocv_target_link_libraries(${the_module} LINK_PRIVATE "-framework Cocoa")

  ocv_target_link_libraries(${the_module} PRIVATE "-framework Cocoa")

endif()



if(TARGET opencv_test_viz)