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

2019-04-19 15:43:58 +03:00
parent 1f517b8a02 3abae3c511
commit c024edb9a8
40 changed files with 332 additions and 351 deletions
@@ -41,6 +41,7 @@
    <junit printsummary="true" haltonfailure="false" haltonerror="false" showoutput="true" logfailedtests="true" maxmemory="256m">
      <sysproperty key="java.library.path" path="${opencv.lib.path}"/>
      <env key="PATH" path="${opencv.lib.path}:${env.PATH}:${env.Path}"/>
+      <env key="DYLD_LIBRARY_PATH" path="${env.OPENCV_SAVED_DYLD_LIBRARY_PATH}"/>  <!-- https://github.com/opencv/opencv/issues/14353 -->
      <classpath refid="master-classpath"/>
      <classpath>
        <pathelement location="build/classes"/>