[poppler] Branch 'poppler-0.14' - cmake/modules

[Pino Toscano]

 cmake/modules/FindCairo.cmake |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit f4874d01f24c7085eccc020774a674c8ed075e0c
Author: Pino Toscano <pino at kde.org>
Date:   Sun Oct 17 14:29:22 2010 +0200

    [CMake] Cairo package: make the version check really working

diff --git a/cmake/modules/FindCairo.cmake b/cmake/modules/FindCairo.cmake
index e3b65ec..d536c05 100644
--- a/cmake/modules/FindCairo.cmake
+++ b/cmake/modules/FindCairo.cmake
@@ -21,10 +21,10 @@ else(CAIRO_INCLUDE_DIRS AND CAIRO_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(FindPkgConfig)
-  if(PACKAGE_FIND_VERSION_COUNT GREATER 0)
-    set(_cairo_version_cmp ">=${PACKAGE_FIND_VERSION}")
-  endif(PACKAGE_FIND_VERSION_COUNT GREATER 0)
+  find_package(PkgConfig REQUIRED)
+  if(Cairo_FIND_VERSION_COUNT GREATER 0)
+    set(_cairo_version_cmp ">=${Cairo_FIND_VERSION}")
+  endif(Cairo_FIND_VERSION_COUNT GREATER 0)
   pkg_check_modules(_pc_cairo cairo${_cairo_version_cmp})
   if(_pc_cairo_FOUND)
     set(CAIRO_FOUND TRUE)