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

2022-08-14 15:50:42 +00:00
parent d09cc0f30c cc8add9f66
commit 2ebdc04787
37 changed files with 246 additions and 90 deletions
@@ -35,7 +35,7 @@ add_subdirectory(python3)

 else()  # standalone build

-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 2.8.12.2)
 project(OpenCVPython CXX C)
 include("./standalone.cmake")

@@ -89,7 +89,7 @@ def bootstrap():
    BINARIES_PATHS = []

    g_vars = globals()
-    l_vars = locals()
+    l_vars = locals().copy()

    if sys.version_info[:2] < (3, 0):
        from . load_config_py2 import exec_file_wrapper