yair/gst-plugin-linescan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: include dir with gstconfig.h required in 1.8

Browse Source
This commit is contained in:
Joshua M. Doe 2016-06-28 13:48:21 -04:00
parent 3ca702aaa9
commit 077442ca4c
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -65,7 +65,7 @@ include_directories(
if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
file(TO_CMAKE_PATH "${GSTREAMER_INCLUDE_DIR}/../.." PREFIX) file(TO_CMAKE_PATH "${GSTREAMER_INCLUDE_DIR}/../.." PREFIX)
set(CMAKE_INSTALL_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) endif(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
# Build the plugins # Build the plugins

7
cmake/modules/FindGStreamer.cmake
View File

@ -53,6 +53,13 @@ find_path(GSTREAMER_INCLUDE_DIR
HINTS ${PKG_GSTREAMER_INCLUDE_DIRS} ${PKG_GSTREAMER_INCLUDEDIR} ${GSTREAMER_ROOT}/include HINTS ${PKG_GSTREAMER_INCLUDE_DIRS} ${PKG_GSTREAMER_INCLUDEDIR} ${GSTREAMER_ROOT}/include
PATH_SUFFIXES gstreamer-${GSTREAMER_ABI_VERSION}) 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) if (PKG_GSTREAMER_PLUGIN_DIR)
set(_GSTREAMER_PLUGIN_DIR ${PKG_GSTREAMER_PLUGIN_DIR}) set(_GSTREAMER_PLUGIN_DIR ${PKG_GSTREAMER_PLUGIN_DIR})
else() else()