Merge remote-tracking branch 'upstream/3.4' into merge-3.4

2026-07-29 23:33:05 +04:00 · 2020-10-28 14:41:08 +00:00
parent 978f387961 97eaddd93b
commit d9a62c42e5
18 changed files with 53 additions and 42 deletions
@@ -1881,3 +1881,9 @@ function(ocv_update_file filepath content)
    file(WRITE "${filepath}" "${content}")
  endif()
 endfunction()
+
+if(NOT BUILD_SHARED_LIBS AND (CMAKE_VERSION VERSION_LESS "3.14.0"))
+  ocv_update(OPENCV_3RDPARTY_EXCLUDE_FROM_ALL "")  # avoid CMake warnings: https://gitlab.kitware.com/cmake/cmake/-/issues/18938
+else()
+  ocv_update(OPENCV_3RDPARTY_EXCLUDE_FROM_ALL "EXCLUDE_FROM_ALL")
+endif()