Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Mon, 16 Dec 2019 21:30:30 +0000 (21:30 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Mon, 16 Dec 2019 21:30:30 +0000 (21:30 +0000)
1  2 
modules/core/src/parallel.cpp
modules/highgui/CMakeLists.txt
modules/highgui/src/window_w32.cpp

Simple merge
@@@ -118,8 -118,14 +118,11 @@@ elseif(WINRT
    endif()
  elseif(HAVE_WIN32UI)
    list(APPEND highgui_srcs ${CMAKE_CURRENT_LIST_DIR}/src/window_w32.cpp)
+   if(OpenCV_ARCH STREQUAL "ARM64")
+     list(APPEND HIGHGUI_LIBRARIES "comdlg32" "advapi32")
+   endif()
  elseif(HAVE_GTK OR HAVE_GTK3)
    list(APPEND highgui_srcs ${CMAKE_CURRENT_LIST_DIR}/src/window_gtk.cpp)
 -elseif(HAVE_CARBON)
 -  list(APPEND highgui_srcs ${CMAKE_CURRENT_LIST_DIR}/src/window_carbon.cpp)
 -  list(APPEND HIGHGUI_LIBRARIES "-framework Carbon" "-framework QuickTime")
  elseif(HAVE_COCOA)
    list(APPEND highgui_srcs ${CMAKE_CURRENT_LIST_DIR}/src/window_cocoa.mm)
    list(APPEND HIGHGUI_LIBRARIES "-framework Cocoa")
Simple merge