1
0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 23:33:05 +04:00

Merge pull request #3700 from MSOpenTech:winrt-cmake-contrib

This commit is contained in:
Vadim Pisarevsky
2015-03-03 12:52:02 +00:00
184 changed files with 8228 additions and 580 deletions
+5 -1
View File
@@ -1,3 +1,7 @@
if(WINRT)
ocv_module_disable(imgcodecs)
endif()
set(the_description "Image codecs")
ocv_add_module(imgcodecs opencv_imgproc WRAP java python)
@@ -9,7 +13,7 @@ ocv_add_module(imgcodecs opencv_imgproc WRAP java python)
ocv_clear_vars(GRFMT_LIBS)
if(HAVE_WINRT_CX)
if(HAVE_WINRT_CX AND NOT WINRT)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /ZW")
endif()