CMakeLists.txt | 2 +- cmake/modules/FindCairo.cmake | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-)
New commits: commit ab0049d8be5dfe1989c4aa33c2732915c62fecb2 Author: Pino Toscano <[email protected]> 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) commit 1cea33717c92631ee9c417d9f89e32b03695c75a Author: Pino Toscano <[email protected]> Date: Sun Oct 17 13:55:58 2010 +0200 [CMake] Bump cairo dependency to 1.10 followup of fc9b85894754d175af916eaf6cb127efd601df7e diff --git a/CMakeLists.txt b/CMakeLists.txt index 406ba88..a05ae89 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -66,7 +66,7 @@ set(TEXTOUT_WORD_LIST ON) # setting the minimum required versions for some components set(QT3_MIN_VERSION "3.3.0") set(QT4_MIN_VERSION "4.4.0") -set(CAIRO_VERSION "1.8.4") +set(CAIRO_VERSION "1.10.0") set(GLIB_REQUIRED "2.18") macro_bool_to_01(ENABLE_SPLASH HAVE_SPLASH) _______________________________________________ poppler mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/poppler
