potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 07:43:03 +04:00
Code Packages Releases Wiki Activity

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

Browse Source
This commit is contained in:
Vadim Pisarevsky
2015-03-03 12:52:02 +00:00
parent d3b74cdcb2 ad1149ff12
commit 6820292256
184 changed files with 8228 additions and 580 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/highgui/CMakeLists.txt
+6 -1
View File
@@ -1,3 +1,7 @@
if (WINRT)
ocv_module_disable(highgui)
endif()
set(the_description "High-level GUI and Media I/O")
ocv_add_module(highgui opencv_imgproc opencv_imgcodecs opencv_videoio OPTIONAL opencv_androidcamera WRAP python)
@@ -7,7 +11,8 @@ ocv_add_module(highgui opencv_imgproc opencv_imgcodecs opencv_videoio OPTIONAL o
# Jose Luis Blanco, 2008
# ----------------------------------------------------------------------------
if(HAVE_WINRT_CX)
# Compilation with /ZW is not allowed for *.c files
if(HAVE_WINRT_CX AND NOT WINRT)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /ZW")
endif()