@@ -221,10 +221,13 @@ OCV_OPTION(BUILD_ITT "Build Intel ITT from source" (NOT MI
221221# ===================================================
222222OCV_OPTION (WITH_1394 "Include IEEE1394 support" ON
223223 VISIBLE_IF NOT ANDROID AND NOT IOS AND NOT WINRT
224- VERIFY HAVE_DC1394 )
224+ VERIFY HAVE_DC1394_2 )
225225OCV_OPTION (WITH_AVFOUNDATION "Use AVFoundation for Video I/O (iOS/Mac)" ON
226226 VISIBLE_IF APPLE
227227 VERIFY HAVE_AVFOUNDATION )
228+ OCV_OPTION (WITH_CAP_IOS "Enable iOS video capture" ON
229+ VISIBLE_IF IOS
230+ VERIFY HAVE_CAP_IOS )
228231OCV_OPTION (WITH_CAROTENE "Use NVidia carotene acceleration library for ARM platform" ON
229232 VISIBLE_IF (ARM OR AARCH64 ) AND NOT IOS AND NOT (CMAKE_VERSION VERSION_LESS "2.8.11" ))
230233OCV_OPTION (WITH_CPUFEATURES "Use cpufeatures Android library" ON
@@ -253,10 +256,7 @@ OCV_OPTION(WITH_FFMPEG "Include FFMPEG support" ON
253256 VERIFY HAVE_FFMPEG )
254257OCV_OPTION (WITH_GSTREAMER "Include Gstreamer support" ON
255258 VISIBLE_IF NOT ANDROID AND NOT IOS AND NOT WINRT
256- VERIFY HAVE_GSTREAMER AND GSTREAMER_BASE_VERSION VERSION_GREATER "0.99" )
257- OCV_OPTION (WITH_GSTREAMER_0_10 "Enable Gstreamer 0.10 support (instead of 1.x)" OFF
258- VISIBLE_IF TRUE
259- VERIFY HAVE_GSTREAMER AND GSTREAMER_BASE_VERSION VERSION_LESS "1.0" )
259+ VERIFY HAVE_GSTREAMER AND GSTREAMER_VERSION VERSION_GREATER "0.99" )
260260OCV_OPTION (WITH_GTK "Include GTK support" ON
261261 VISIBLE_IF UNIX AND NOT APPLE AND NOT ANDROID
262262 VERIFY HAVE_GTK )
@@ -308,9 +308,6 @@ OCV_OPTION(WITH_GDCM "Include DICOM support" OFF
308308OCV_OPTION (WITH_PVAPI "Include Prosilica GigE support" OFF
309309 VISIBLE_IF NOT ANDROID AND NOT IOS AND NOT WINRT
310310 VERIFY HAVE_PVAPI )
311- OCV_OPTION (WITH_GIGEAPI "Include Smartek GigE support" OFF
312- VISIBLE_IF NOT ANDROID AND NOT IOS AND NOT WINRT
313- VERIFY HAVE_GIGE_API )
314311OCV_OPTION (WITH_ARAVIS "Include Aravis GigE support" OFF
315312 VISIBLE_IF NOT ANDROID AND NOT IOS AND NOT WINRT AND NOT WIN32
316313 VERIFY HAVE_ARAVIS_API )
@@ -371,9 +368,6 @@ OCV_OPTION(WITH_OPENCLAMDBLAS "Include AMD OpenCL BLAS library support" ON
371368OCV_OPTION (WITH_DIRECTX "Include DirectX support" ON
372369 VISIBLE_IF WIN32 AND NOT WINRT
373370 VERIFY HAVE_DIRECTX )
374- OCV_OPTION (WITH_INTELPERC "Include Intel Perceptual Computing support" OFF
375- VISIBLE_IF WIN32 AND NOT WINRT
376- VERIFY HAVE_INTELPERC )
377371OCV_OPTION (WITH_LIBREALSENSE "Include Intel librealsense support" OFF
378372 VISIBLE_IF NOT WITH_INTELPERC
379373 VERIFY HAVE_LIBREALSENSE )
@@ -1351,7 +1345,7 @@ if(WITH_GDAL OR HAVE_GDAL)
13511345endif ()
13521346
13531347if (WITH_GDCM OR HAVE_GDCM)
1354- status (" GDCM:" HAVE_GDCM THEN "YES (ver ${GDCM_VERSION} )" ELSE "NO" )
1348+ status (" GDCM:" HAVE_GDCM THEN "YES (${GDCM_VERSION} )" ELSE "NO" )
13551349endif ()
13561350
13571351if (WITH_IMGCODEC_HDR OR DEFINED HAVE_IMGCODEC_HDR)
@@ -1375,11 +1369,7 @@ status("")
13751369status (" Video I/O:" )
13761370
13771371if (WITH_1394 OR HAVE_DC1394_2)
1378- if (HAVE_DC1394_2)
1379- status (" DC1394:" "YES (ver ${ALIASOF_libdc1394-2_VERSION})" )
1380- else ()
1381- status (" DC1394:" "NO" )
1382- endif ()
1372+ status (" DC1394:" HAVE_DC1394_2 THEN "YES (${DC1394_2_VERSION} )" ELSE NO )
13831373endif ()
13841374
13851375if (WITH_FFMPEG OR HAVE_FFMPEG)
@@ -1390,79 +1380,64 @@ if(WITH_FFMPEG OR HAVE_FFMPEG)
13901380 else ()
13911381 status (" FFMPEG:" HAVE_FFMPEG THEN YES ELSE NO )
13921382 endif ()
1393- status (" avcodec:" FFMPEG_libavcodec_FOUND THEN "YES (ver ${FFMPEG_libavcodec_VERSION} )" ELSE NO )
1394- status (" avformat:" FFMPEG_libavformat_FOUND THEN "YES (ver ${FFMPEG_libavformat_VERSION} )" ELSE NO )
1395- status (" avutil:" FFMPEG_libavutil_FOUND THEN "YES (ver ${FFMPEG_libavutil_VERSION} )" ELSE NO )
1396- status (" swscale:" FFMPEG_libswscale_FOUND THEN "YES (ver ${FFMPEG_libswscale_VERSION} )" ELSE NO )
1397- status (" avresample:" FFMPEG_libavresample_FOUND THEN "YES (ver ${FFMPEG_libavresample_VERSION} )" ELSE NO )
1383+ status (" avcodec:" FFMPEG_libavcodec_VERSION THEN "YES (${FFMPEG_libavcodec_VERSION} )" ELSE NO )
1384+ status (" avformat:" FFMPEG_libavformat_VERSION THEN "YES (${FFMPEG_libavformat_VERSION} )" ELSE NO )
1385+ status (" avutil:" FFMPEG_libavutil_VERSION THEN "YES (${FFMPEG_libavutil_VERSION} )" ELSE NO )
1386+ status (" swscale:" FFMPEG_libswscale_VERSION THEN "YES (${FFMPEG_libswscale_VERSION} )" ELSE NO )
1387+ status (" avresample:" FFMPEG_libavresample_VERSION THEN "YES (${FFMPEG_libavresample_VERSION} )" ELSE NO )
13981388endif ()
13991389
14001390if (WITH_GSTREAMER OR HAVE_GSTREAMER)
1401- status (" GStreamer:" HAVE_GSTREAMER THEN "" ELSE NO )
1402- if (HAVE_GSTREAMER)
1403- status (" base:" "YES (ver ${GSTREAMER_BASE_VERSION} )" )
1404- status (" video:" "YES (ver ${GSTREAMER_VIDEO_VERSION} )" )
1405- status (" app:" "YES (ver ${GSTREAMER_APP_VERSION} )" )
1406- status (" riff:" "YES (ver ${GSTREAMER_RIFF_VERSION} )" )
1407- status (" pbutils:" "YES (ver ${GSTREAMER_PBUTILS_VERSION} )" )
1408- endif (HAVE_GSTREAMER )
1409- endif ()
1410-
1411- if (WITH_OPENNI OR HAVE_OPENNI)
1412- status (" OpenNI:" HAVE_OPENNI THEN "YES (ver ${OPENNI_VERSION_STRING} , build ${OPENNI_VERSION_BUILD} )" ELSE NO )
1413- status (" OpenNI PrimeSensor Modules:" HAVE_OPENNI_PRIME_SENSOR_MODULE THEN "YES (${OPENNI_PRIME_SENSOR_MODULE} )" ELSE NO )
1391+ status (" GStreamer:" HAVE_GSTREAMER THEN "YES (${GSTREAMER_VERSION} )" ELSE NO )
14141392endif ()
14151393
14161394if (WITH_OPENNI2 OR HAVE_OPENNI2)
1417- status (" OpenNI2:" HAVE_OPENNI2 THEN "YES (ver ${OPENNI2_VERSION_STRING} , build ${OPENNI2_VERSION_BUILD } )" ELSE NO )
1395+ status (" OpenNI2:" HAVE_OPENNI2 THEN "YES (${OPENNI2_VERSION } )" ELSE NO )
14181396endif ()
14191397
14201398if (WITH_PVAPI OR HAVE_PVAPI)
1421- status (" PvAPI:" HAVE_PVAPI THEN YES ELSE NO )
1399+ status (" PvAPI:" HAVE_PVAPI THEN YES ELSE NO )
14221400endif ()
14231401
1424- if (WITH_GIGEAPI OR HAVE_GIGE_API )
1425- status (" GigEVisionSDK :" HAVE_GIGE_API THEN YES ELSE NO )
1402+ if (WITH_ARAVIS OR HAVE_ARAVIS_API )
1403+ status (" Aravis SDK :" HAVE_ARAVIS_API THEN " YES ( ${ARAVIS_VERSION} )" ELSE NO )
14261404endif ()
14271405
1428- if (WITH_ARAVIS OR HAVE_ARAVIS_API )
1429- status (" Aravis SDK :" HAVE_ARAVIS_API THEN " YES ( ${ARAVIS_LIBRARIES} )" ELSE NO )
1406+ if (WITH_AVFOUNDATION OR HAVE_AVFOUNDATION )
1407+ status (" AVFoundation :" HAVE_AVFOUNDATION THEN YES ELSE NO )
14301408endif ()
14311409
1432- if (APPLE )
1433- status (" AVFoundation:" HAVE_AVFOUNDATION THEN YES ELSE NO )
1434- if (WITH_QUICKTIME OR HAVE_QUICKTIME)
1435- status (" QuickTime:" HAVE_QUICKTIME THEN YES ELSE NO )
1436- endif ()
1410+ if (HAVE_CAP_IOS)
1411+ status (" iOS capture:" YES )
14371412endif ()
14381413
1439- if (WITH_V4L OR HAVE_CAMV4L2 OR HAVE_VIDEOIO )
1414+ if (WITH_V4L OR HAVE_V4L )
14401415 ocv_build_features_string (v4l_status
14411416 IF HAVE_CAMV4L2 THEN "linux/videodev2.h"
14421417 IF HAVE_VIDEOIO THEN "sys/videoio.h"
14431418 ELSE "NO" )
1444- status (" v4l/v4l2:" " ${v4l_status} " )
1419+ status (" v4l/v4l2:" HAVE_V4L THEN "YES ( ${v4l_status} )" ELSE NO )
14451420endif ()
14461421
14471422if (WITH_DSHOW OR HAVE_DSHOW)
1448- status (" DirectShow:" HAVE_DSHOW THEN YES ELSE NO )
1423+ status (" DirectShow:" HAVE_DSHOW THEN YES ELSE NO )
14491424endif ()
14501425
14511426if (WITH_MSMF OR HAVE_MSMF)
1452- status (" Media Foundation:" HAVE_MSMF THEN YES ELSE NO )
1453- status (" DXVA:" HAVE_MSMF_DXVA THEN YES ELSE NO )
1427+ status (" Media Foundation:" HAVE_MSMF THEN YES ELSE NO )
1428+ status (" DXVA:" HAVE_MSMF_DXVA THEN YES ELSE NO )
14541429endif ()
14551430
14561431if (WITH_XIMEA OR HAVE_XIMEA)
1457- status (" XIMEA:" HAVE_XIMEA THEN YES ELSE NO )
1432+ status (" XIMEA:" HAVE_XIMEA THEN YES ELSE NO )
14581433endif ()
14591434
14601435if (WITH_XINE OR HAVE_XINE)
1461- status (" Xine:" HAVE_XINE THEN "YES (ver ${ALIASOF_libxine_VERSION } )" ELSE NO )
1436+ status (" Xine:" HAVE_XINE THEN "YES (${XINE_VERSION } )" ELSE NO )
14621437endif ()
14631438
1464- if (WITH_INTELPERC OR HAVE_INTELPERC )
1465- status (" Intel PerC :" HAVE_INTELPERC THEN "YES" ELSE NO )
1439+ if (WITH_LIBREALSENSE OR HAVE_LIBREALSENSE )
1440+ status (" Intel RealSense :" HAVE_LIBREALSENSE THEN "YES ( ${LIBREALSENSE_VERSION} )" ELSE NO )
14661441endif ()
14671442
14681443if (WITH_MFX OR HAVE_MFX)
0 commit comments