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

List:       kde-commits
Subject:    kdesupport/phonon/cmake
From:       David Faure <faure () kde ! org>
Date:       2009-03-09 11:19:21
Message-ID: 1236597561.397946.17817.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 937281 by dfaure:

Apply patch by Fabrice Ménard <menard.fabrice orange fr>, from kde-buildsystem. He says :
"As ${PKG_GOBJECT2_INCLUDE_DIRS} might be a list we can't simply append path components to it.
For example, on my system pkg-config --cflags gobject-2.0 returns :
        '-I/opt/gnome/include/glib-2.0 -I/opt/gnome/lib/glib-2.0/include' "


 M  +2 -3      FindGObject.cmake  


--- trunk/kdesupport/phonon/cmake/FindGObject.cmake #937280:937281
@@ -25,11 +25,10 @@
    SET(GOBJECT_DEFINITIONS ${PKG_GOBJECT2_CFLAGS})
 ENDIF (NOT WIN32)
 
-FIND_PATH(GOBJECT_INCLUDE_DIR gobject.h
+FIND_PATH(GOBJECT_INCLUDE_DIR gobject/gobject.h
    PATHS
    ${PKG_GOBJECT2_INCLUDE_DIRS}
-   ${PKG_GOBJECT2_INCLUDE_DIRS}/glib-2.0/gobject/
-   /usr/include/glib-2.0/gobject/
+   /usr/include/glib-2.0/
    #PATH_SUFFIXES gst
    )
 
[prev in list] [next in list] [prev in thread] [next in thread]