From 5427ede6a16e28f47bd69af6ba4377b7db949097 Mon Sep 17 00:00:00 2001 From: Gregory Morse Date: Thu, 31 Dec 2015 14:31:26 +0100 Subject: [PATCH] WinRT consistency --- modules/highgui/CMakeLists.txt | 2 +- modules/videostab/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/highgui/CMakeLists.txt b/modules/highgui/CMakeLists.txt index 9d1745e7b7..eee6a934ac 100644 --- a/modules/highgui/CMakeLists.txt +++ b/modules/highgui/CMakeLists.txt @@ -7,7 +7,7 @@ ocv_add_module(highgui opencv_imgproc opencv_imgcodecs opencv_videoio WRAP pytho # 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() diff --git a/modules/videostab/CMakeLists.txt b/modules/videostab/CMakeLists.txt index 49e75f9ad1..c31fcfceb5 100644 --- a/modules/videostab/CMakeLists.txt +++ b/modules/videostab/CMakeLists.txt @@ -4,7 +4,7 @@ if(HAVE_CUDA) ocv_warnings_disable(CMAKE_CXX_FLAGS -Wundef -Wmissing-declarations -Wshadow -Wunused-parameter) endif() -if(WINRT_8_1) +if(DEFINED WINRT AND NOT DEFINED ENABLE_WINRT_MODE_NATIVE) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /ZW") endif()