Merge pull request #5904 from GregoryMorse:master

This commit is contained in:
Alexander Alekhin 2016-01-04 05:30:28 +00:00
commit c06eaf83da
2 changed files with 2 additions and 2 deletions

View 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()

View 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()