diff --git a/modules/videoio/cmake/detect_gstreamer.cmake b/modules/videoio/cmake/detect_gstreamer.cmake index 7b74693f5e..2198786161 100644 --- a/modules/videoio/cmake/detect_gstreamer.cmake +++ b/modules/videoio/cmake/detect_gstreamer.cmake @@ -40,6 +40,10 @@ if(NOT HAVE_GSTREAMER AND WIN32) NAMES gstriff gstriff-1.0 PATHS ${env_paths} PATH_SUFFIXES "lib") + find_library(GSTREAMER_video_LIBRARY + NAMES gstvideo gstvideo-1.0 + PATHS ${env_paths} + PATH_SUFFIXES "lib") find_library(GSTREAMER_glib_LIBRARY NAMES glib-2.0 @@ -58,6 +62,7 @@ if(NOT HAVE_GSTREAMER AND WIN32) AND GSTREAMER_base_LIBRARY AND GSTREAMER_pbutils_LIBRARY AND GSTREAMER_riff_LIBRARY + AND GSTREAMER_video_LIBRARY AND GSTREAMER_glib_LIBRARY AND GSTREAMER_gobject_LIBRARY) file(STRINGS "${GSTREAMER_gst_INCLUDE_DIR}/gst/gstversion.h" ver_strings REGEX "#define +GST_VERSION_(MAJOR|MINOR|MICRO|NANO).*") @@ -71,6 +76,7 @@ if(NOT HAVE_GSTREAMER AND WIN32) ${GSTREAMER_base_LIBRARY} ${GSTREAMER_app_LIBRARY} ${GSTREAMER_riff_LIBRARY} + ${GSTREAMER_video_LIBRARY} ${GSTREAMER_pbutils_LIBRARY} ${GSTREAMER_glib_LIBRARY} ${GSTREAMER_gobject_LIBRARY}) @@ -86,11 +92,12 @@ if(NOT HAVE_GSTREAMER AND PKG_CONFIG_FOUND) ocv_check_modules(GSTREAMER_app gstreamer-app-1.0) ocv_check_modules(GSTREAMER_riff gstreamer-riff-1.0) ocv_check_modules(GSTREAMER_pbutils gstreamer-pbutils-1.0) - if(GSTREAMER_base_FOUND AND GSTREAMER_app_FOUND AND GSTREAMER_riff_FOUND AND GSTREAMER_pbutils_FOUND) + ocv_check_modules(GSTREAMER_video gstreamer-video-1.0) + if(GSTREAMER_base_FOUND AND GSTREAMER_app_FOUND AND GSTREAMER_riff_FOUND AND GSTREAMER_pbutils_FOUND AND GSTREAMER_video_FOUND) set(HAVE_GSTREAMER TRUE) set(GSTREAMER_VERSION ${GSTREAMER_base_VERSION} PARENT_SCOPE) # informational - set(GSTREAMER_LIBRARIES ${GSTREAMER_base_LIBRARIES} ${GSTREAMER_app_LIBRARIES} ${GSTREAMER_riff_LIBRARIES} ${GSTREAMER_pbutils_LIBRARIES}) - set(GSTREAMER_INCLUDE_DIRS ${GSTREAMER_base_INCLUDE_DIRS} ${GSTREAMER_app_INCLUDE_DIRS} ${GSTREAMER_riff_INCLUDE_DIRS} ${GSTREAMER_pbutils_INCLUDE_DIRS}) + set(GSTREAMER_LIBRARIES ${GSTREAMER_base_LIBRARIES} ${GSTREAMER_app_LIBRARIES} ${GSTREAMER_riff_LIBRARIES} ${GSTREAMER_pbutils_LIBRARIES} ${GSTREAMER_video_LIBRARIES}) + set(GSTREAMER_INCLUDE_DIRS ${GSTREAMER_base_INCLUDE_DIRS} ${GSTREAMER_app_INCLUDE_DIRS} ${GSTREAMER_riff_INCLUDE_DIRS} ${GSTREAMER_pbutils_INCLUDE_DIRS} ${GSTREAMER_video_INCLUDE_DIRS}) endif() endif()