From 574320ec3f983884d411dae89b25fc7da998518e Mon Sep 17 00:00:00 2001 From: David Fan Date: Sun, 23 Jan 2022 09:02:14 -0500 Subject: [PATCH] Merge pull request #21500 from Kanaderu:fix-gst-audio-win videoio: added explicit gst-audio dependency for windows * Update detect_gstreamer.cmake videoio: added explicit gst-audio dependency for win32 * Fixed whitespace --- modules/videoio/cmake/detect_gstreamer.cmake | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/videoio/cmake/detect_gstreamer.cmake b/modules/videoio/cmake/detect_gstreamer.cmake index fc6c347383..b2ab06060d 100644 --- a/modules/videoio/cmake/detect_gstreamer.cmake +++ b/modules/videoio/cmake/detect_gstreamer.cmake @@ -44,6 +44,10 @@ if(NOT HAVE_GSTREAMER AND WIN32) NAMES gstvideo gstvideo-1.0 PATHS ${env_paths} PATH_SUFFIXES "lib") + find_library(GSTREAMER_audio_LIBRARY + NAMES gstaudio gstaudio-1.0 + PATHS ${env_paths} + PATH_SUFFIXES "lib") find_library(GSTREAMER_glib_LIBRARY NAMES glib-2.0 @@ -63,6 +67,7 @@ if(NOT HAVE_GSTREAMER AND WIN32) AND GSTREAMER_pbutils_LIBRARY AND GSTREAMER_riff_LIBRARY AND GSTREAMER_video_LIBRARY + AND GSTREAMER_audio_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).*") @@ -77,6 +82,7 @@ if(NOT HAVE_GSTREAMER AND WIN32) ${GSTREAMER_app_LIBRARY} ${GSTREAMER_riff_LIBRARY} ${GSTREAMER_video_LIBRARY} + ${GSTREAMER_audio_LIBRARY} ${GSTREAMER_pbutils_LIBRARY} ${GSTREAMER_glib_LIBRARY} ${GSTREAMER_gobject_LIBRARY})