From: Tony Date: Tue, 8 Apr 2014 18:25:51 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/master' into gtk3 X-Git-Tag: submit/tizen_ivi/20141117.190038~2^2~369^2~1^2~6 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d60be58a924bdebf8874a862473c35bfd07922fd;p=profile%2Fivi%2Fopencv.git Merge remote-tracking branch 'upstream/master' into gtk3 Conflicts: CMakeLists.txt --- d60be58a924bdebf8874a862473c35bfd07922fd diff --cc CMakeLists.txt index f15f701,c00dfc5..66a63f0 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@@ -127,8 -127,8 +127,9 @@@ OCV_OPTION(WITH_FFMPEG "Includ OCV_OPTION(WITH_GSTREAMER "Include Gstreamer support" ON IF (UNIX AND NOT APPLE AND NOT ANDROID) ) OCV_OPTION(WITH_GSTREAMER_0_10 "Enable Gstreamer 0.10 support (instead of 1.x)" OFF ) OCV_OPTION(WITH_GTK "Include GTK support" ON IF (UNIX AND NOT APPLE AND NOT ANDROID) ) +OCV_OPTION(WITH_GTK_2_X "Use GTK version 2" OFF IF (UNIX AND NOT APPLE AND NOT ANDROID) ) - OCV_OPTION(WITH_IPP "Include Intel IPP support" OFF IF (MSVC OR X86 OR X86_64) ) + OCV_OPTION(WITH_ICV "Include Intel IPP ICV support" ON IF (NOT IOS) ) + OCV_OPTION(WITH_IPP "Include Intel IPP support" OFF IF (NOT IOS) ) OCV_OPTION(WITH_JASPER "Include JPEG2K support" ON IF (NOT IOS) ) OCV_OPTION(WITH_JPEG "Include JPEG support" ON) OCV_OPTION(WITH_WEBP "Include WebP support" ON IF (NOT IOS) )