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

2020-03-17 13:23:33 +03:00
parent c48473dfe4 1d7bfcc958
commit ca23c0e630
24 changed files with 565 additions and 145 deletions
@@ -41,6 +41,7 @@ add_subdirectory(python3)
 else()  # standalone build

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

 endif()