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

List:       kde-commits
Subject:    extragear/base/kwebkitpart/cmake/modules
From:       Ingmar Vanhassel <ingmar () exherbo ! org>
Date:       2010-08-16 22:49:09
Message-ID: 20100816224909.167F1AC855 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1164504 by ingmarvanhassel:

Stop using pkg-config, we don't install a kwebkit.pc file anywhere

As far as I can see, all this does is generate a confusing warning when
running find_package(KWebKitPart):

  -- checking for module 'kwebkit'
  --   package 'kwebkit' not found

 M  +0 -12     FindKWebKitPart.cmake  


--- trunk/extragear/base/kwebkitpart/cmake/modules/FindKWebKitPart.cmake #1164503:1164504
@@ -20,25 +20,13 @@
     set(KWEBKITPART_INCLUDE_DIR ${CMAKE_SOURCE_DIR})
 endif(kwebkitpart_SOURCE_DIR)
 
-# use pkg-config to get the directories and then use these values
-# in the FIND_PATH() and FIND_LIBRARY() calls
-if( NOT WIN32 )
-  find_package(PkgConfig)
-  pkg_check_modules(PC_KWEBKITPART kwebkit)
-  set(PCRE_DEFINITIONS ${PC_KWEBKITPART_CFLAGS_OTHER})
-endif( NOT WIN32 )
-
 FIND_PATH(KWEBKITPART_INCLUDE_DIR NAMES kwebkitpart.h
   PATHS
-  ${PC_KWEBKITPART_INCLUDEDIR} 
-  ${PC_KWEBKITPART_INCLUDE_DIRS}
   ${KDE4_INCLUDE_INSTALL_DIR}
 )
 
 FIND_LIBRARY(KWEBKITPART_LIBRARIES NAMES kwebkit
   PATHS
-  ${PC_KWEBKITPART_LIBDIR} 
-  ${PC_KWEBKITPART_LIBRARY_DIRS}
   ${KDE4_LIB_INSTALL_DIR}
 )
 
[prev in list] [next in list] [prev in thread] [next in thread]