Merge pull request #1986 from GregoryMorse:patch-3

2026-07-29 23:33:05 +04:00 · 2014-03-18 16:18:32 +04:00
parent 6e44f05e6f 90920c2376
commit b70332d806
4 changed files with 10230 additions and 70 deletions
@@ -9,6 +9,10 @@ ocv_add_module(highgui opencv_imgproc OPTIONAL opencv_androidcamera)

 ocv_clear_vars(GRFMT_LIBS)

+if(HAVE_WINRT_CX)
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /ZW")
+endif()
+
 if(HAVE_PNG OR HAVE_TIFF OR HAVE_OPENEXR)
  ocv_include_directories(${ZLIB_INCLUDE_DIRS})
  list(APPEND GRFMT_LIBS ${ZLIB_LIBRARIES})