[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs/cmake/modules
From:       Thiago Macieira <thiago () kde ! org>
Date:       2008-02-05 16:38:42
Message-ID: 1202229522.309134.3419.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 771265 by thiago:

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.


 M  +12 -7     FindGStreamer.cmake  


--- trunk/KDE/kdelibs/cmake/modules/FindGStreamer.cmake #771264:771265
@@ -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 @@
    ${_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 @@
    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 @@
    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)


[prev in list] [next in list] [prev in thread] [next in thread]