From 97427aa6149ca8b81cec148ee4766322f8fb8a5e Mon Sep 17 00:00:00 2001 From: Andrey Kamaev Date: Mon, 9 Apr 2012 14:41:18 +0000 Subject: [PATCH] Added more version information to cmake status (FFMPEG, GStreamer, Unicap, Xine, V4L, DC1394) --- CMakeLists.txt | 69 +++++++++++++++++++++++++++++++++++++++------------------- 1 file changed, 47 insertions(+), 22 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bee1cfd..e7ff2d0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -381,7 +381,9 @@ if(UNIX) endif() if(HAVE_FFMPEG) - CHECK_MODULE(libavformat>=52.111.0 NEW_FFMPEG) + if(NOT ALIASOF_libavformat_VERSION VERSION_LESS "52.111.0") + set(NEW_FFMPEG ON) + endif() endif() if(WITH_1394) @@ -436,13 +438,17 @@ if(APPLE AND WITH_FFMPEG) set(FFMPEG_LIB_DIR "${FFMPEG_INCLUDE_DIR}/../lib" CACHE PATH "Full path of FFMPEG library directory") if(EXISTS "${FFMPEG_LIB_DIR}/libavcodec.a") set(HAVE_FFMPEG_CODEC 1) + set(ALIASOF_libavcodec_VERSION "Unknown") if(EXISTS "${FFMPEG_LIB_DIR}/libavformat.a") set(HAVE_FFMPEG_FORMAT 1) + set(ALIASOF_libavformat_VERSION "Unknown") if(EXISTS "${FFMPEG_LIB_DIR}/libavutil.a") set(HAVE_FFMPEG_UTIL 1) + set(ALIASOF_libavutil_VERSION "Unknown") if(EXISTS "${FFMPEG_LIB_DIR}/libswscale.a") ocv_include_directories(${FFMPEG_INCLUDE_DIR}) set(HAVE_FFMPEG_SWSCALE 1) + set(ALIASOF_libswscale_VERSION "Unknown") set(HIGHGUI_LIBRARIES ${HIGHGUI_LIBRARIES} "${FFMPEG_LIB_DIR}/libavcodec.a" "${FFMPEG_LIB_DIR}/libavformat.a" "${FFMPEG_LIB_DIR}/libavutil.a" "${FFMPEG_LIB_DIR}/libswscale.a") @@ -648,6 +654,9 @@ include(cmake/OpenCVGenConfig.cmake REQUIRED) # ---------------------------------------------------------------------------- status("") status("General configuration for OpenCV ${OPENCV_VERSION} =====================================") +if(OPENCV_SVNVERSION) + status("svn:" "${OPENCV_SVNVERSION}") +endif() #build platform status("") @@ -741,9 +750,9 @@ else() status(" Cocoa:" YES) endif() else() - status(" GTK+ 2.x:" HAVE_GTK THEN YES ELSE NO) - status(" GThread :" HAVE_GTHREAD THEN YES ELSE NO) - status(" GtkGlExt:" HAVE_GTKGLEXT THEN YES ELSE NO) + status(" GTK+ 2.x:" HAVE_GTK THEN "YES (ver ${ALIASOF_gtk+-2.0_VERSION})" ELSE NO) + status(" GThread :" HAVE_GTHREAD THEN "YES (ver ${ALIASOF_gthread-2.0_VERSION})" ELSE NO) + status(" GtkGlExt:" HAVE_GTKGLEXT THEN "YES (ver ${ALIASOF_gtkglext-1.0_VERSION})" ELSE NO) endif() endif() endif() @@ -753,25 +762,25 @@ status(" OpenGL support:" HAVE_OPENGL THEN "YES (${OPENGL_LIBRARIES})" ELSE N # media status("") status(" Media I/O: ") -status(" ZLib:" BUILD_ZLIB THEN "build (ver ${ZLIB_VERSION_STRING})" ELSE "${ZLIB_LIBRARY} (ver ${ZLIB_VERSION_STRING})") +status(" ZLib:" BUILD_ZLIB THEN "build (ver ${ZLIB_VERSION_STRING})" ELSE "${ZLIB_LIBRARY} (ver ${ZLIB_VERSION_STRING})") if(WITH_JPEG) - status(" JPEG:" JPEG_FOUND THEN "${JPEG_LIBRARY} (ver ${JPEG_LIB_VERSION})" ELSE "build (ver ${JPEG_LIB_VERSION})") + status(" JPEG:" JPEG_FOUND THEN "${JPEG_LIBRARY} (ver ${JPEG_LIB_VERSION})" ELSE "build (ver ${JPEG_LIB_VERSION})") else() status(" JPEG:" "NO") endif() if(WITH_PNG) - status(" PNG:" PNG_FOUND THEN "${PNG_LIBRARY} (ver ${PNG_VERSION})" ELSE "build (ver ${PNG_VERSION})") + status(" PNG:" PNG_FOUND THEN "${PNG_LIBRARY} (ver ${PNG_VERSION})" ELSE "build (ver ${PNG_VERSION})") else() status(" PNG:" "NO") endif() if(WITH_TIFF) - status(" TIFF:" TIFF_FOUND THEN "${TIFF_LIBRARY} (ver ${TIFF_VERSION})" ELSE "build (ver ${TIFF_VERSION})") + status(" TIFF:" TIFF_FOUND THEN "${TIFF_LIBRARY} (ver ${TIFF_VERSION})" ELSE "build (ver ${TIFF_VERSION})") else() status(" TIFF:" "NO") endif() if(WITH_JASPER) - status(" JPEG 2000:" JASPER_FOUND THEN "${JASPER_LIBRARY} (ver ${JASPER_VERSION_STRING})" ELSE "build (ver ${JASPER_VERSION_STRING})") + status(" JPEG 2000:" JASPER_FOUND THEN "${JASPER_LIBRARY} (ver ${JASPER_VERSION_STRING})" ELSE "build (ver ${JASPER_VERSION_STRING})") else() status(" JPEG 2000:" "NO") endif() @@ -788,23 +797,39 @@ endif() status("") if(UNIX AND NOT APPLE) status(" Video I/O:") - status(" DC1394 1.x:" HAVE_DC1394 THEN YES ELSE NO) - status(" DC1394 2.x:" HAVE_DC1394_2 THEN YES ELSE NO) + status(" DC1394 1.x:" HAVE_DC1394 THEN "YES (ver ${ALIASOF_libdc1394_VERSION})" ELSE NO) + status(" DC1394 2.x:" HAVE_DC1394_2 THEN "YES (ver ${ALIASOF_libdc1394-2_VERSION})" ELSE NO) endif() if(UNIX) status(" FFMPEG:" HAVE_FFMPEG THEN YES ELSE NO) - status(" codec:" HAVE_FFMPEG_CODEC THEN YES ELSE NO) - status(" format:" HAVE_FFMPEG_FORMAT THEN YES ELSE NO) - status(" util:" HAVE_FFMPEG_UTIL THEN YES ELSE NO) - status(" swscale:" HAVE_FFMPEG_SWSCALE THEN YES ELSE NO) + status(" codec:" HAVE_FFMPEG_CODEC THEN "YES (ver ${ALIASOF_libavcodec_VERSION})" ELSE NO) + status(" format:" HAVE_FFMPEG_FORMAT THEN "YES (ver ${ALIASOF_libavformat_VERSION})" ELSE NO) + status(" util:" HAVE_FFMPEG_UTIL THEN "YES (ver ${ALIASOF_libavutil_VERSION})" ELSE NO) + status(" swscale:" HAVE_FFMPEG_SWSCALE THEN "YES (ver ${ALIASOF_libswscale_VERSION})" ELSE NO) status(" gentoo-style:" HAVE_GENTOO_FFMPEG THEN YES ELSE NO) endif() if(UNIX AND NOT APPLE) - status(" GStreamer:" HAVE_GSTREAMER THEN YES ELSE NO) - status(" UniCap:" HAVE_UNICAP THEN YES ELSE NO) + status(" GStreamer:" HAVE_GSTREAMER THEN "" ELSE NO) + if(HAVE_GSTREAMER) + status(" base:" "YES (ver ${ALIASOF_gstreamer-base-0.10_VERSION})") + status(" app:" "YES (ver ${ALIASOF_gstreamer-app-0.10_VERSION})") + status(" video:" "YES (ver ${ALIASOF_gstreamer-video-0.10_VERSION})") + endif() + status(" UniCap:" HAVE_UNICAP THEN "YES (ver ${ALIASOF_libunicap_VERSION})" ELSE NO) + status(" UniCap ucil:" HAVE_UNICAP_UCIL THEN "YES (ver ${ALIASOF_libucil_VERSION})" ELSE NO) status(" PvAPI:" HAVE_PVAPI THEN YES ELSE NO) - status(" V4L/V4L2:" HAVE_LIBV4L THEN "Using libv4l" ELSE ${HAVE_CAMV4L}/${HAVE_CAMV4L2}) - status(" Xine:" HAVE_XINE THEN YES ELSE NO) + if(HAVE_CAMV4L) + set(HAVE_CAMV4L_STR "YES") + else() + set(HAVE_CAMV4L_STR "NO") + endif() + if(HAVE_CAMV4L2) + set(HAVE_CAMV4L2_STR "YES") + else() + set(HAVE_CAMV4L2_STR "NO") + endif() + status(" V4L/V4L2:" HAVE_LIBV4L THEN "Using libv4l (ver ${ALIASOF_libv4l1_VERSION})" ELSE "${HAVE_CAMV4L_STR}/${HAVE_CAMV4L2_STR} (ver ${ALIASOF_libv4l1_VERSION})") + status(" Xine:" HAVE_XINE THEN "YES (ver ${ALIASOF_libxine_VERSION}" ELSE NO) if(ANDROID) if(HAVE_opencv_androidcamera) @@ -844,9 +869,9 @@ if(HAVE_CUDA) status(" Use CUFFT:" HAVE_CUFFT THEN YES ELSE NO) status(" Use CUBLAS:" HAVE_CUBLAS THEN YES ELSE NO) - status(" NVIDIA GPU arch:" OPENCV_CUDA_ARCH_BIN) - status(" NVIDIA PTX archs:" OPENCV_CUDA_ARCH_BIN) - status(" NVIDIA GPU features": OPENCV_CUDA_ARCH_FEATURES) + status(" NVIDIA GPU arch:" "${OPENCV_CUDA_ARCH_BIN}") + status(" NVIDIA PTX archs:" "${OPENCV_CUDA_ARCH_BIN}") + status(" NVIDIA GPU features:" "${OPENCV_CUDA_ARCH_FEATURES}") endif() # interfaces to other languages -- 2.7.4