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

List:       kde-commits
Subject:    playground/libs/webkitkde
From:       Laurent Montel <montel () kde ! org>
Date:       2008-12-16 12:50:04
Message-ID: 1229431804.168687.32303.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 897622 by mlaurent:

Port it


 M  +2 -2      kdenetwork/cmake/modules/FindKdeNetwork.cmake  
 M  +7 -5      part/cmake/modules/FindWebKitPart.cmake  


--- trunk/playground/libs/webkitkde/kdenetwork/cmake/modules/FindKdeNetwork.cmake #897621:897622
@@ -34,8 +34,8 @@
 
 FIND_PATH(KDENETWORK_INCLUDE_DIR NAMES knetworkaccessmanager.h
   PATHS
-  ${PC_KDENETWORK_LIBDIR} 
-  ${PC_KDENETWORK_LIBRARY_DIRS}
+  ${PC_KDENETWORK_INCLUDEDIR} 
+  ${PC_KDENETWORK_INCLUDE_DIRS}
   ${KDE4_INCLUDE_INSTALL_DIR}
   PATH_SUFFIXES kdenetwork
 )
--- trunk/playground/libs/webkitkde/part/cmake/modules/FindWebKitPart.cmake #897621:897622
@@ -24,23 +24,25 @@
 # use pkg-config to get the directories and then use these values
 # in the FIND_PATH() and FIND_LIBRARY() calls
 if( NOT WIN32 )
-  INCLUDE(UsePkgConfig)
+  find_package(PkgConfig)
 
-  PKGCONFIG(webkitpart _WebKitPartIncDir _WebKitPartLinkDir _WebKitPartLinkFlags _WebKitPartCflags)
+  pkg_check_modules(PC_WEBKITPART webkitpart)
 
-  SET(WEBKITPART_DEFINITIONS ${_WebKitPartCflags})
+  set(PCRE_DEFINITIONS ${PC_WEBKITPART_CFLAGS_OTHER})
 endif( NOT WIN32 )
 
 FIND_PATH(WEBKITPART_INCLUDE_DIR NAMES webkitpart.h
   PATHS
-  ${_WebKitPartIncDir}
+  ${PC_WEBKITPART_INCLUDEDIR} 
+  ${PC_WEBKITPART_INCLUDE_DIRS}
   ${KDE4_INCLUDE_INSTALL_DIR}
   PATH_SUFFIXES webkitkde
 )
 
 FIND_LIBRARY(WEBKITPART_LIBRARIES NAMES webkitkde
   PATHS
-  ${_WebKitPartLinkDir}
+  ${PC_WEBKITPART_LIBDIR} 
+  ${PC_WEBKITPART_LIBRARY_DIRS}
   ${KDE4_LIB_INSTALL_DIR}
 )
 
[prev in list] [next in list] [prev in thread] [next in thread]