diff options
| author | Thiago Macieira <thiago@kde.org> | 2008-02-05 16:38:41 +0000 |
|---|---|---|
| committer | Thiago Macieira <thiago@kde.org> | 2008-02-05 16:38:41 +0000 |
| commit | 5006fea71975220db9abf436e9f6dcea3e94f2f0 (patch) | |
| tree | c31266bfe350177b78ef9820996e3e18bd591324 /modules | |
| parent | 1ed1dcce2c979c8b706f81a042c712e2fb00cef0 (diff) | |
| download | extra-cmake-modules-5006fea71975220db9abf436e9f6dcea3e94f2f0.tar.gz extra-cmake-modules-5006fea71975220db9abf436e9f6dcea3e94f2f0.tar.bz2 | |
Add more library to the GStreamer library search.
Note: the gstreamer 0.10 package comes with 5 libraries and we only
check for one. In addition, we check for a library that comes from the
gstreamer-plugins-base 0.10 package.
I suggest this be cleaned up. The extra library can go into
FindGStreamerPlugins.cmake file.
svn path=/trunk/KDE/kdelibs/; revision=771265
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/FindGStreamer.cmake | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/modules/FindGStreamer.cmake b/modules/FindGStreamer.cmake index 2d752dd9..4398f150 100644 --- a/modules/FindGStreamer.cmake +++ b/modules/FindGStreamer.cmake @@ -10,12 +10,12 @@ # TODO: Other versions --> GSTREAMER_X_Y_FOUND (Example: GSTREAMER_0_8_FOUND and GSTREAMER_0_10_FOUND etc) -IF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_INTERFACE_LIBRARY) +IF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_INTERFACE_LIBRARY) # in cache already SET(GStreamer_FIND_QUIETLY TRUE) -ELSE (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_INTERFACE_LIBRARY) +ELSE (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_INTERFACE_LIBRARY) SET(GStreamer_FIND_QUIETLY FALSE) -ENDIF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_INTERFACE_LIBRARY) +ENDIF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_INTERFACE_LIBRARY) IF (NOT WIN32) # use pkg-config to get the directories and then use these values @@ -40,6 +40,11 @@ FIND_LIBRARY(GSTREAMER_LIBRARIES NAMES gstreamer-0.10 ${_GStreamerLinkDir} ) +FIND_LIBRARY(GSTREAMER_BASE_LIBRARY NAMES gstbase-0.10 + PATHS + ${_GStreamerLinkDir} + ) + FIND_LIBRARY(GSTREAMER_INTERFACE_LIBRARY NAMES gstinterfaces-0.10 PATHS ${_GStreamerLinkDir} @@ -63,11 +68,11 @@ ELSE (GSTREAMER_INTERFACE_LIBRARY) MESSAGE(STATUS "GStreamer: WARNING: interface library not found") ENDIF (GSTREAMER_INTERFACE_LIBRARY) -IF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_INTERFACE_LIBRARY) +IF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_INTERFACE_LIBRARY) SET(GSTREAMER_FOUND TRUE) -ELSE (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_INTERFACE_LIBRARY) +ELSE (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_INTERFACE_LIBRARY) SET(GSTREAMER_FOUND FALSE) -ENDIF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_INTERFACE_LIBRARY) +ENDIF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_INTERFACE_LIBRARY) IF (GSTREAMER_FOUND) IF (NOT GStreamer_FIND_QUIETLY) @@ -79,4 +84,4 @@ ELSE (GSTREAMER_FOUND) ENDIF (GStreamer_FIND_REQUIRED) ENDIF (GSTREAMER_FOUND) -MARK_AS_ADVANCED(GSTREAMER_INCLUDE_DIR GSTREAMER_LIBRARIES GSTREAMER_INTERFACE_LIBRARY) +MARK_AS_ADVANCED(GSTREAMER_INCLUDE_DIR GSTREAMER_LIBRARIES GSTREAMER_BASE_LIBRARY GSTREAMER_INTERFACE_LIBRARY) |