[moved from opencv] Merge pull request opencv/opencv#16150 from alalek:cmake_avoid_deprecated_link_private

* cmake: avoid deprecated LINK_PRIVATE/LINK_PUBLIC

see CMP0023 (CMake 2.8.12+)

* cmake: fix 3rdparty list

- don't include OpenCV modules

original commit: a45928045a
pull/2386/head
Alexander Alekhin 5 years ago committed by GitHub
parent b11fb78146
commit aaf67d6f61
  1. 2
      modules/cudev/test/CMakeLists.txt
  2. 4
      modules/viz/CMakeLists.txt

@ -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})

@ -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)

Loading…
Cancel
Save