|
|
|
@ -76,7 +76,7 @@ elseif(WINRT) |
|
|
|
|
# Enabling it for WiRT 8.1+ only. |
|
|
|
|
|
|
|
|
|
# WinRT 8.1+ detected. Adding WinRT API header. |
|
|
|
|
status(" ${name}: WinRT detected. Adding WinRT API header") |
|
|
|
|
message(STATUS " ${name}: WinRT detected. Adding WinRT API header") |
|
|
|
|
list(APPEND highgui_ext_hdrs "${CMAKE_CURRENT_LIST_DIR}/include/opencv2/${name}/highgui_winrt.hpp") |
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -92,16 +92,16 @@ elseif(WINRT) |
|
|
|
|
if(WINRT_PHONE OR (OpenCV_ARCH STREQUAL "ARM")) |
|
|
|
|
list(REMOVE_ITEM HIGHGUI_LIBRARIES "comctl32" "gdi32" "ole32" "setupapi") |
|
|
|
|
if(WINRT_PHONE) |
|
|
|
|
status(" ${name}: Windows Phone detected") |
|
|
|
|
message(STATUS " ${name}: Windows Phone detected") |
|
|
|
|
elseif(OpenCV_ARCH STREQUAL "ARM") |
|
|
|
|
status(" ${name}: ARM detected") |
|
|
|
|
message(STATUS " ${name}: ARM detected") |
|
|
|
|
if(WINRT_STORE) |
|
|
|
|
list(REMOVE_ITEM HIGHGUI_LIBRARIES "ws2_32") |
|
|
|
|
status(" ${name}: Removing 'ws2_32.lib'") |
|
|
|
|
message(STATUS " ${name}: Removing 'ws2_32.lib'") |
|
|
|
|
endif() |
|
|
|
|
endif() |
|
|
|
|
status(" ${name}: Removing 'comctl32.lib, gdi32.lib, ole32.lib, setupapi.lib'") |
|
|
|
|
status(" ${name}: Leaving '${HIGHGUI_LIBRARIES}'") |
|
|
|
|
message(STATUS " ${name}: Removing 'comctl32.lib, gdi32.lib, ole32.lib, setupapi.lib'") |
|
|
|
|
message(STATUS " ${name}: Leaving '${HIGHGUI_LIBRARIES}'") |
|
|
|
|
endif() |
|
|
|
|
elseif(HAVE_WIN32UI) |
|
|
|
|
list(APPEND highgui_srcs ${CMAKE_CURRENT_LIST_DIR}/src/window_w32.cpp) |
|
|
|
|