Port them too

svn path=/trunk/KDE/kdelibs/; revision=882802

6 files changed, 36 insertions, 37 deletions

diff --git a/modules/FindGStreamer.cmake b/modules/FindGStreamer.cmake
index 5a94452b..291ddc3b 100644
--- a/modules/FindGStreamer.cmake
+++ b/modules/FindGStreamer.cmake
@@ -20,34 +20,33 @@ ENDIF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY
 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)
-   PKGCONFIG(gstreamer-0.10 _GStreamerIncDir _GStreamerLinkDir _GStreamerLinkFlags _GStreamerCflags)
-   #MESSAGE(STATUS "DEBUG: GStreamer include directory = ${_GStreamerIncDir}")
-   #MESSAGE(STATUS "DEBUG: GStreamer link directory = ${_GStreamerLinkDir}")
-   #MESSAGE(STATUS "DEBUG: GStreamer link flags = ${_GStreamerLinkFlags}")
-   #MESSAGE(STATUS "DEBUG: GStreamer CFlags = ${_GStreamerCflags}") 
-   SET(GSTREAMER_DEFINITIONS ${_GStreamerCflags})
+   find_package(PkgConfig)
+   pkg_check_modules(GSTREAMER gstreamer-0.10)
+   #MESSAGE(STATUS "DEBUG: GStreamer include directory = ${GSTREAMER_INCLUDE_DIRS}")
+   #MESSAGE(STATUS "DEBUG: GStreamer link directory = ${GSTREAMER_LIBRARY_DIRS}")
+   #MESSAGE(STATUS "DEBUG: GStreamer CFlags = ${GSTREAMER_CFLAGS}") 
+   SET(GSTREAMER_DEFINITIONS ${GSTREAMER_CFLAGS})
 ENDIF (NOT WIN32)
 
 FIND_PATH(GSTREAMER_INCLUDE_DIR gst/gst.h
    PATHS
-   ${_GStreamerIncDir}
+   ${GSTREAMER_INCLUDE_DIRS}
    #PATH_SUFFIXES gst
    )
 
 FIND_LIBRARY(GSTREAMER_LIBRARIES NAMES gstreamer-0.10
    PATHS
-   ${_GStreamerLinkDir}
+   ${GSTREAMER_LIBRARY_DIRS}
    )
 
 FIND_LIBRARY(GSTREAMER_BASE_LIBRARY NAMES gstbase-0.10
    PATHS
-   ${_GStreamerLinkDir}
+   ${GSTREAMER_LIBRARY_DIRS}
    )
 
 FIND_LIBRARY(GSTREAMER_INTERFACE_LIBRARY NAMES gstinterfaces-0.10
    PATHS
-   ${_GStreamerLinkDir}
+   ${GSTREAMER_LIBRARY_DIRS}
    )
 
 IF (GSTREAMER_INCLUDE_DIR)
diff --git a/modules/FindLibArt.cmake b/modules/FindLibArt.cmake
index 59687877..13191d23 100644
--- a/modules/FindLibArt.cmake
+++ b/modules/FindLibArt.cmake
@@ -19,24 +19,25 @@ if (LIBART_INCLUDE_DIR AND LIBART_LIBRARIES)
 else (LIBART_INCLUDE_DIR AND LIBART_LIBRARIES)
 
   IF (NOT WIN32)
-    INCLUDE(UsePkgConfig)
+    find_package(PkgConfig)
+
     # use pkg-config to get the directories and then use these values
     # in the FIND_PATH() and FIND_LIBRARY() calls
-    PKGCONFIG(libart-2.0 _libArtIncDir _libArtLinkDir _libArtLinkFlags _libArtCflags)
+    pkg_check_modules(LIBART libart-2.0)
 
     ######### ?? where is this used ?? ###############
-    set(LIBART_DEFINITIONS ${_libArtCflags})
+    set(LIBART_DEFINITIONS ${LIBART_CFLAGS})
   ENDIF (NOT WIN32)
 
   FIND_PATH(LIBART_INCLUDE_DIR libart_lgpl/libart.h
-     ${_libArtIncDir}/libart-2.0
+     ${LIBART_INCLUDE_DIRS}/libart-2.0
      /usr/include/libart-2.0
      /usr/local/include/libart-2.0
   )
   
   FIND_LIBRARY(LIBART_LIBRARIES NAMES art_lgpl_2
      PATHS
-     ${_libArtLinkDir}
+     ${LIBART_LIBRARY_DIRS}
   )
   
   
diff --git a/modules/FindLibXml2.cmake b/modules/FindLibXml2.cmake
index bbe5e8b2..8615e77b 100644
--- a/modules/FindLibXml2.cmake
+++ b/modules/FindLibXml2.cmake
@@ -21,20 +21,20 @@ ENDIF (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES)
 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)
-   PKGCONFIG(libxml-2.0 _LibXml2IncDir _LibXml2LinkDir _LibXml2LinkFlags _LibXml2Cflags)
-   SET(LIBXML2_DEFINITIONS ${_LibXml2Cflags})
+   find_package(PkgConfig)
+   pkg_check_modules(LIBXML libxml-2.0)
+   SET(LIBXML2_DEFINITIONS ${LIBXML_CFLAGS})
 ENDIF (NOT WIN32)
 
 FIND_PATH(LIBXML2_INCLUDE_DIR libxml/xpath.h
    PATHS
-   ${_LibXml2IncDir}
+   ${LIBXML_INCLUDE_DIRS}
    PATH_SUFFIXES libxml2
    )
 
 FIND_LIBRARY(LIBXML2_LIBRARIES NAMES xml2 libxml2
    PATHS
-   ${_LibXml2LinkDir}
+   ${LIBXML_LIBRARY_DIRS}
    )
 
 IF (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES)
diff --git a/modules/FindLibXslt.cmake b/modules/FindLibXslt.cmake
index 41443d07..76e8f77a 100644
--- a/modules/FindLibXslt.cmake
+++ b/modules/FindLibXslt.cmake
@@ -21,23 +21,23 @@ ENDIF (LIBXSLT_INCLUDE_DIR AND LIBXSLT_LIBRARIES)
 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)
-   PKGCONFIG(libxslt _LibXsltIncDir _LibXsltLinkDir _LibXsltLinkFlags _LibXsltCflags)
-   SET(LIBXSLT_DEFINITIONS ${_LibXsltCflags})
+   find_package(PkgConfig)
+   pkg_check_modules(XSLT libxslt)
+   SET(LIBXSLT_DEFINITIONS ${XSLT_CFLAGS})
 ENDIF (NOT WIN32)
 
 FIND_PATH(LIBXSLT_INCLUDE_DIR libxslt/xslt.h
-    ${_LibXsltIncDir}
+    ${XSLT_INCLUDE_DIRS}
   )
 
 FIND_LIBRARY(LIBXSLT_LIBRARIES NAMES xslt libxslt
     PATHS
-    ${_LibXsltLinkDir}
+    ${XSLT_LIBRARY_DIRS}
   )
 
 FIND_LIBRARY(LIBEXSLT_LIBRARIES NAMES exslt libexslt
     PATHS
-    ${_LibXsltLinkDir}
+    ${XSLT_LIBRARY_DIRS}
   )
 
 IF (LIBXSLT_INCLUDE_DIR AND LIBXSLT_LIBRARIES)
diff --git a/modules/FindQCA2.cmake b/modules/FindQCA2.cmake
index 950d923c..3549779d 100644
--- a/modules/FindQCA2.cmake
+++ b/modules/FindQCA2.cmake
@@ -23,16 +23,16 @@ if (QCA2_INCLUDE_DIR AND QCA2_LIBRARIES)
 
 else (QCA2_INCLUDE_DIR AND QCA2_LIBRARIES)
 
-  INCLUDE(UsePkgConfig)
 
   IF (NOT WIN32)
-    PKGCONFIG(qca2 QCA2_INCLUDE_DIR _Qca2LinkDir _Qca2LinkFlags _Qca2Cflags)
+    find_package(PkgConfig)
+    pkg_check_modules(QCA2 qca2)
 
-    set(QCA2_DEFINITIONS ${_Qca2Cflags})
+    set(QCA2_DEFINITIONS ${QCA2_CFLAGS})
 
     FIND_LIBRARY(QCA2_LIBRARIES NAMES qca
       PATHS
-      ${_Qca2LinkDir}
+      ${QCA2_LIBRARY_DIRS}
       NO_DEFAULT_PATH
     )
   ELSE (NOT WIN32)
diff --git a/modules/FindUSB.cmake b/modules/FindUSB.cmake
index ff18d3b3..862388b9 100644
--- a/modules/FindUSB.cmake
+++ b/modules/FindUSB.cmake
@@ -5,7 +5,7 @@
 #  LIBUSB_INCLUDE_DIR - the libusb include directory
 #  LIBUSB_LIBRARIES - Link these to use libusb
 
-# Copyright (c) 2006, Laurent Montel, <montel@kde.org>
+# Copyright (c) 2006, 2008  Laurent Montel, <montel@kde.org>
 #
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
@@ -20,16 +20,15 @@ else (LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES)
   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)
-
-    PKGCONFIG(libusb _libUSBIncDir _libUSBLinkDir _libUSBLinkFlags _libUSBCflags)
+    find_package(PkgConfig)
+    pkg_check_modules(LIBUSB libusb)
   ENDIF(NOT WIN32)
 
   FIND_PATH(LIBUSB_INCLUDE_DIR usb.h
-    PATHS ${_libUSBIncDir} )
+    PATHS ${LIBUSB_INCLUDE_DIRS} )
 
   FIND_LIBRARY(LIBUSB_LIBRARIES NAMES usb 
-    PATHS ${_libUSBLinkDir} )
+    PATHS ${LIBUSB_LIBRARY_DIRS} )
 
   include(FindPackageHandleStandardArgs)
   FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBUSB DEFAULT_MSG LIBUSB_LIBRARIES LIBUSB_INCLUDE_DIR)