From 077442ca4c2d402d87a7c3978b3e2429aa8b3d81 Mon Sep 17 00:00:00 2001
From: "Joshua M. Doe" <oss@nvl.army.mil>
Date: Tue, 28 Jun 2016 13:48:21 -0400
Subject: [PATCH] build: include dir with gstconfig.h required in 1.8

---
 CMakeLists.txt                    | 2 +-
 cmake/modules/FindGStreamer.cmake | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 78212f4..8e488a0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -65,7 +65,7 @@ include_directories(
 if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
     file(TO_CMAKE_PATH "${GSTREAMER_INCLUDE_DIR}/../.." PREFIX)
     set(CMAKE_INSTALL_PREFIX
-        ${PREFIX} CACHE PATH "Directory to install plugins, under lib/gstreamer-0.10" FORCE)
+        ${PREFIX} CACHE PATH "Directory to install plugins, under lib/gstreamer-1.0" FORCE)
 endif(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
 
 # Build the plugins
diff --git a/cmake/modules/FindGStreamer.cmake b/cmake/modules/FindGStreamer.cmake
index a6486e0..6a1323d 100644
--- a/cmake/modules/FindGStreamer.cmake
+++ b/cmake/modules/FindGStreamer.cmake
@@ -53,6 +53,13 @@ find_path(GSTREAMER_INCLUDE_DIR
           HINTS ${PKG_GSTREAMER_INCLUDE_DIRS} ${PKG_GSTREAMER_INCLUDEDIR} ${GSTREAMER_ROOT}/include
           PATH_SUFFIXES gstreamer-${GSTREAMER_ABI_VERSION})
 
+find_path(GSTREAMER_INCLUDE_DIR_ARCH
+          gst/gstconfig.h
+          HINTS ${PKG_GSTREAMER_INCLUDE_DIRS} ${PKG_GSTREAMER_INCLUDEDIR} ${GSTREAMER_ROOT}/lib/gstreamer-1.0/include
+          PATH_SUFFIXES gstreamer-${GSTREAMER_ABI_VERSION})
+
+set(GSTREAMER_INCLUDE_DIR ${GSTREAMER_INCLUDE_DIR} ${GSTREAMER_INCLUDE_DIR_ARCH})
+
 if (PKG_GSTREAMER_PLUGIN_DIR)
     set(_GSTREAMER_PLUGIN_DIR ${PKG_GSTREAMER_PLUGIN_DIR})
 else()