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

build: update Find cmake files to find 64-bit GStreamer

Browse Source
This commit is contained in:
Joshua M. Doe
2014-12-11 10:57:17 -05:00
parent a66d8ae243
commit 732e6a2d7e
6 changed files with 108 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
cmake/modules/FindGObject.cmake
View File

@@ -28,9 +28,15 @@ IF (NOT WIN32)
SET(GOBJECT_DEFINITIONS ${PKG_GOBJECT2_CFLAGS})
ENDIF (NOT WIN32)
if (CMAKE_SIZEOF_VOID_P MATCHES "8")
set(GSTREAMER_ROOT $ENV{GSTREAMER_1_0_ROOT_X86_64})
else ()
set(GSTREAMER_ROOT $ENV{GSTREAMER_1_0_ROOT_X86})
endif ()
FIND_PATH(GOBJECT_INCLUDE_DIR gobject/gobject.h
HINTS ${PKG_GOBJECT2_INCLUDE_DIRS} ${PKG_GOBJECT2_INCLUDEDIR}
PATHS /usr/include/glib-2.0/ $ENV{GSTREAMER_1_0_ROOT_X86}/include
PATHS /usr/include/glib-2.0/ ${GSTREAMER_ROOT}/include
PATH_SUFFIXES glib-2.0
)
@@ -38,25 +44,25 @@ FIND_LIBRARY(_GObjectLibs NAMES gobject-2.0
HINTS
${PKG_GOBJECT2_LIBRARY_DIRS}
${PKG_GOBJECT2_LIBDIR}
$ENV{GSTREAMER_1_0_ROOT_X86}/lib
${GSTREAMER_ROOT}/lib
)
FIND_LIBRARY(_GModuleLibs NAMES gmodule-2.0
HINTS
${PKG_GOBJECT2_LIBRARY_DIRS}
${PKG_GOBJECT2_LIBDIR}
$ENV{GSTREAMER_1_0_ROOT_X86}/lib
${GSTREAMER_ROOT}/lib
)
FIND_LIBRARY(_GThreadLibs NAMES gthread-2.0
HINTS
${PKG_GOBJECT2_LIBRARY_DIRS}
${PKG_GOBJECT2_LIBDIR}
$ENV{GSTREAMER_1_0_ROOT_X86}/lib
${GSTREAMER_ROOT}/lib
)
FIND_LIBRARY(_GLibs NAMES glib-2.0
HINTS
${PKG_GOBJECT2_LIBRARY_DIRS}
${PKG_GOBJECT2_LIBDIR}
$ENV{GSTREAMER_1_0_ROOT_X86}/lib
${GSTREAMER_ROOT}/lib
)
SET (GOBJECT_LIBRARIES ${_GObjectLibs} ${_GModuleLibs} ${_GThreadLibs} ${_GLibs})