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

List:       amarok
Subject:    FindGdk proposed patch
From:       Fabrice =?iso-8859-1?q?M=E9nard?= <menard.fabrice () orange ! fr>
Date:       2008-09-08 21:08:12
Message-ID: 200809082308.12974.menard.fabrice () orange ! fr
[Download RAW message or body]

Hi,

I propose this patch to FindGdk.cmake as UsePkgConfig has been marked
as deprecated.

Best regards,

Fabrice Ménard


["FindGDK.patch" (text/x-patch)]

Index: cmake/modules/FindGdk.cmake
===================================================================
--- cmake/modules/FindGdk.cmake	(revision 857619)
+++ cmake/modules/FindGdk.cmake	(working copy)
@@ -1,4 +1,4 @@
-# - Try to find the libgpod library
+# - Try to find the gdk library
 # Once done this will define
 #
 #  GDK_FOUND - system has libgpod
@@ -16,20 +16,20 @@
   if(NOT WIN32)
     # use pkg-config to get the directories and then use these values
     # in the FIND_PATH() and FIND_LIBRARY() calls
-    INCLUDE(UsePkgConfig)
+    INCLUDE(FindPkgConfig)
   
-    PKGCONFIG(gdk-pixbuf-2.0 _GDKIncDir _GDKLinkDir _GDKLinkFlags _GDKCflags)
-  
-    set(GDK_DEFINITIONS ${_GDKCflags})
+    pkg_check_modules(GDK gdk-pixbuf-2.0)
+    set(GDK_DEFINITIONS ${GDK_CFLAGS})
+
   endif(NOT WIN32)
 
   FIND_PATH(GDK_INCLUDE_DIR gdk-pixbuf/gdk-pixbuf.h /usr/include/gtk-2.0
-    ${_GDKIncDir}
+    ${GDK_INCLUDEDIR}/gtk-2.0
   )
   
   FIND_LIBRARY(GDK_LIBRARIES NAMES gdk_pixbuf-2.0
     PATHS
-    ${_GDKLinkDir}
+    ${GDK_LIBDIR}
   )
 
   if (GDK_INCLUDE_DIR AND GDK_LIBRARIES)
@@ -38,9 +38,7 @@
     SET(GDK_FOUND_FALSE)
   endif (GDK_INCLUDE_DIR AND GDK_LIBRARIES)
 
-  include(FindPackageHandleStandardArgs)
-  FIND_PACKAGE_HANDLE_STANDARD_ARGS(Gdk DEFAULT_MSG GDK_INCLUDE_DIR GDK_LIBRARIES )
- 
+
   MARK_AS_ADVANCED(GDK_INCLUDE_DIR GDK_LIBRARIES)
   
 endif (GDK_INCLUDE_DIR AND GDK_LIBRARIES)


_______________________________________________
Amarok mailing list
Amarok@kde.org
https://mail.kde.org/mailman/listinfo/amarok


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