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

List:       kde-commits
Subject:    kdesupport/phonon/cmake
From:       Patrick Spendrin <ps_ml () gmx ! de>
Date:       2008-08-29 23:19:18
Message-ID: 1220051958.835725.26204.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 854650 by sengels:

fix build error if you don't have GStreamer installed

 M  +2 -1      FindGStreamer.cmake  
 M  +2 -1      FindGStreamerPlugins.cmake  


--- trunk/kdesupport/phonon/cmake/FindGStreamer.cmake #854649:854650
@@ -23,7 +23,8 @@
    FIND_PACKAGE(PkgConfig REQUIRED)
    # use pkg-config to get the directories and then use these values
    # in the FIND_PATH() and FIND_LIBRARY() calls
-   PKG_CHECK_MODULES(PKG_GSTREAMER REQUIRED gstreamer-0.10)
+   # don't make this check required - otherwise you can't use macro_optional_find_package on this one
+   PKG_CHECK_MODULES(PKG_GSTREAMER gstreamer-0.10)
    SET(GSTREAMER_DEFINITIONS ${PKG_GSTREAMER_CFLAGS})
 ENDIF (NOT WIN32)
 
--- trunk/kdesupport/phonon/cmake/FindGStreamerPlugins.cmake #854649:854650
@@ -11,7 +11,8 @@
 FIND_PACKAGE(PkgConfig REQUIRED)
 
 IF (NOT WIN32)
-   PKG_CHECK_MODULES( PKG_GSTREAMER REQUIRED gstreamer-plugins-base-0.10 )
+   # don't make this check required - otherwise you can't use macro_optional_find_package on this one
+   PKG_CHECK_MODULES( PKG_GSTREAMER gstreamer-plugins-base-0.10 )
 ENDIF (NOT WIN32)
 
 #
[prev in list] [next in list] [prev in thread] [next in thread]