mirror of
https://github.com/opencv/opencv.git
synced 2025-01-18 22:44:02 +08:00
Update CMakeLists.txt
Fix C++/CX support for all WINRT and bring back native-mode only support which was removed
This commit is contained in:
parent
d6f8a75e91
commit
1ab7acf015
@ -7,7 +7,7 @@ ocv_add_module(videoio opencv_imgproc opencv_imgcodecs WRAP java python)
|
||||
# Jose Luis Blanco, 2008
|
||||
# ----------------------------------------------------------------------------
|
||||
|
||||
if(WINRT_8_1)
|
||||
if(DEFINED WINRT AND NOT DEFINED ENABLE_WINRT_MODE_NATIVE)
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /ZW")
|
||||
endif()
|
||||
|
||||
@ -38,7 +38,7 @@ list(REMOVE_ITEM videoio_ext_hdrs "${CMAKE_CURRENT_LIST_DIR}/include/opencv2/${n
|
||||
# Dependencies used by the implementation referenced
|
||||
# below are not available on WinRT 8.0.
|
||||
# Enabling it for WiRT 8.1+ only.
|
||||
if(DEFINED WINRT AND NOT DEFINED WINRT_8_0)
|
||||
if(DEFINED WINRT AND NOT DEFINED WINRT_8_0 AND NOT DEFINED ENABLE_WINRT_MODE_NATIVE)
|
||||
|
||||
# WinRT detected. Adding WinRT API header
|
||||
message(STATUS " ${name}: WinRT detected. Adding WinRT API header")
|
||||
|
Loading…
Reference in New Issue
Block a user