From f6aa6d95390d424304bf0d8d666af43492182347 Mon Sep 17 00:00:00 2001 From: mrstecklo Date: Thu, 12 Nov 2020 11:15:40 +0300 Subject: [PATCH] finding GStreamer on arm64 --- cmake/modules/FindGStreamer.cmake | 6 +++--- cmake/modules/MacroFindGStreamerLibrary.cmake | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/cmake/modules/FindGStreamer.cmake b/cmake/modules/FindGStreamer.cmake index 25e82b8..695e924 100644 --- a/cmake/modules/FindGStreamer.cmake +++ b/cmake/modules/FindGStreamer.cmake @@ -48,7 +48,7 @@ endif () find_library(GSTREAMER_LIBRARY NAMES gstreamer-${GSTREAMER_ABI_VERSION} - HINTS ${PKG_GSTREAMER_LIBRARY_DIRS} ${PKG_GSTREAMER_LIBDIR} ${GSTREAMER_ROOT}/lib) + HINTS ${PKG_GSTREAMER_LIBRARY_DIRS} ${PKG_GSTREAMER_LIBDIR} ${GSTREAMER_ROOT}/lib ${GSTREAMER_ROOT}/lib/aarch64-linux-gnu) find_path(GSTREAMER_INCLUDE_DIR gst/gst.h @@ -57,14 +57,14 @@ find_path(GSTREAMER_INCLUDE_DIR find_path(GSTREAMER_INCLUDE_DIR_ARCH gst/gstconfig.h - HINTS ${PKG_GSTREAMER_INCLUDE_DIRS} ${PKG_GSTREAMER_INCLUDEDIR} ${GSTREAMER_ROOT}/lib/gstreamer-1.0/include + HINTS ${PKG_GSTREAMER_INCLUDE_DIRS} ${PKG_GSTREAMER_INCLUDEDIR} ${GSTREAMER_ROOT}/lib/gstreamer-${GSTREAMER_ABI_VERSION}/include ${GSTREAMER_ROOT}/include/gstreamer-${GSTREAMER_ABI_VERSION} PATH_SUFFIXES gstreamer-${GSTREAMER_ABI_VERSION}) if (GSTREAMER_INCLUDE_DIR_ARCH) set(GSTREAMER_INCLUDE_DIR ${GSTREAMER_INCLUDE_DIR} ${GSTREAMER_INCLUDE_DIR_ARCH}) endif () -if (PKG_GSTREAMER_PLUGIN_DIR) +if (EXISTS PKG_GSTREAMER_PLUGIN_DIR) set(_GSTREAMER_PLUGIN_DIR ${PKG_GSTREAMER_PLUGIN_DIR}) else() get_filename_component(_GSTREAMER_LIB_DIR ${GSTREAMER_LIBRARY} PATH) diff --git a/cmake/modules/MacroFindGStreamerLibrary.cmake b/cmake/modules/MacroFindGStreamerLibrary.cmake index 3f0cda2..2cd1b1c 100644 --- a/cmake/modules/MacroFindGStreamerLibrary.cmake +++ b/cmake/modules/MacroFindGStreamerLibrary.cmake @@ -33,6 +33,7 @@ macro(find_gstreamer_library _name _header _abi_version) HINTS ${PKG_GSTREAMER_${_upper_name}_LIBRARY_DIRS} ${PKG_GSTREAMER_${_upper_name}_LIBDIR} ${GSTREAMER_ROOT}/lib + ${GSTREAMER_ROOT}/lib/aarch64-linux-gnu ) find_path(GSTREAMER_${_upper_name}_INCLUDE_DIR