]> Gitweb @ Texas Instruments - Open Source Git Repositories - git.TI.com/gitweb - opencv/tiopencv.git/commitdiff
WinRT consistency
authorGregory Morse <gregory.morse@live.com>
Thu, 31 Dec 2015 13:31:26 +0000 (14:31 +0100)
committerGregory Morse <gregory.morse@live.com>
Thu, 31 Dec 2015 13:31:26 +0000 (14:31 +0100)
modules/highgui/CMakeLists.txt
modules/videostab/CMakeLists.txt

index 9d1745e7b7d9fb623f0d49746e07656d3c40d9b9..eee6a934ac4db45dfdd704356caf7af5b1a3fb81 100644 (file)
@@ -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()
 
index 49e75f9ad13a0bc30c12349ab32485f00cc25adb..c31fcfceb5ff3eff813018782dffdce50aee81f8 100644 (file)
@@ -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()