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
@@ -125,8 +125,8 @@ elseif(HAVE_COCOA)
  list(APPEND HIGHGUI_LIBRARIES "-framework Cocoa")
 endif()

-if(UNIX)
-  #these variables are set by CHECK_MODULE macro
+if(TRUE)
+  # these variables are set by 'ocv_append_build_options(HIGHGUI ...)'
  foreach(P ${HIGHGUI_INCLUDE_DIRS})
    ocv_include_directories(${P})
  endforeach()