mirror of
https://github.com/opencv/opencv.git
synced 2025-06-08 01:53:19 +08:00
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
This commit is contained in:
parent
b796ededae
commit
574320ec3f
@ -44,6 +44,10 @@ if(NOT HAVE_GSTREAMER AND WIN32)
|
|||||||
NAMES gstvideo gstvideo-1.0
|
NAMES gstvideo gstvideo-1.0
|
||||||
PATHS ${env_paths}
|
PATHS ${env_paths}
|
||||||
PATH_SUFFIXES "lib")
|
PATH_SUFFIXES "lib")
|
||||||
|
find_library(GSTREAMER_audio_LIBRARY
|
||||||
|
NAMES gstaudio gstaudio-1.0
|
||||||
|
PATHS ${env_paths}
|
||||||
|
PATH_SUFFIXES "lib")
|
||||||
|
|
||||||
find_library(GSTREAMER_glib_LIBRARY
|
find_library(GSTREAMER_glib_LIBRARY
|
||||||
NAMES glib-2.0
|
NAMES glib-2.0
|
||||||
@ -63,6 +67,7 @@ if(NOT HAVE_GSTREAMER AND WIN32)
|
|||||||
AND GSTREAMER_pbutils_LIBRARY
|
AND GSTREAMER_pbutils_LIBRARY
|
||||||
AND GSTREAMER_riff_LIBRARY
|
AND GSTREAMER_riff_LIBRARY
|
||||||
AND GSTREAMER_video_LIBRARY
|
AND GSTREAMER_video_LIBRARY
|
||||||
|
AND GSTREAMER_audio_LIBRARY
|
||||||
AND GSTREAMER_glib_LIBRARY
|
AND GSTREAMER_glib_LIBRARY
|
||||||
AND GSTREAMER_gobject_LIBRARY)
|
AND GSTREAMER_gobject_LIBRARY)
|
||||||
file(STRINGS "${GSTREAMER_gst_INCLUDE_DIR}/gst/gstversion.h" ver_strings REGEX "#define +GST_VERSION_(MAJOR|MINOR|MICRO|NANO).*")
|
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_app_LIBRARY}
|
||||||
${GSTREAMER_riff_LIBRARY}
|
${GSTREAMER_riff_LIBRARY}
|
||||||
${GSTREAMER_video_LIBRARY}
|
${GSTREAMER_video_LIBRARY}
|
||||||
|
${GSTREAMER_audio_LIBRARY}
|
||||||
${GSTREAMER_pbutils_LIBRARY}
|
${GSTREAMER_pbutils_LIBRARY}
|
||||||
${GSTREAMER_glib_LIBRARY}
|
${GSTREAMER_glib_LIBRARY}
|
||||||
${GSTREAMER_gobject_LIBRARY})
|
${GSTREAMER_gobject_LIBRARY})
|
||||||
|
Loading…
Reference in New Issue
Block a user