summaryrefslogtreecommitdiffstats
path: root/CMakeScripts/Modules
diff options
context:
space:
mode:
authorAlex Valavanis <valavanisalex@gmail.com>2016-01-11 15:02:29 +0000
committerAlex Valavanis <valavanisalex@gmail.com>2016-01-11 15:02:29 +0000
commit0290dcac6a900038f2950f21efb95f495c1fc8de (patch)
tree3fc0b170a6325aa8c6a462b5d6a9c1d6343bb9ca /CMakeScripts/Modules
parentBump poppler dep to 0.20.0 (diff)
downloadinkscape-0290dcac6a900038f2950f21efb95f495c1fc8de.tar.gz
inkscape-0290dcac6a900038f2950f21efb95f495c1fc8de.zip
Update CMake for poppler >= 0.20.0 dependency
(bzr r14574)
Diffstat (limited to 'CMakeScripts/Modules')
-rw-r--r--CMakeScripts/Modules/FindPopplerCairo.cmake6
1 files changed, 3 insertions, 3 deletions
diff --git a/CMakeScripts/Modules/FindPopplerCairo.cmake b/CMakeScripts/Modules/FindPopplerCairo.cmake
index 2565e7bb2..bde884ec6 100644
--- a/CMakeScripts/Modules/FindPopplerCairo.cmake
+++ b/CMakeScripts/Modules/FindPopplerCairo.cmake
@@ -23,9 +23,9 @@ else (POPPLER_LIBRARIES AND POPPLER_INCLUDE_DIRS)
# in the FIND_PATH() and FIND_LIBRARY() calls
find_package(PkgConfig)
if (PKG_CONFIG_FOUND)
- INKSCAPE_PKG_CONFIG_FIND(POPPLER poppler >=0.5.9 poppler-config.h poppler poppler)
+ INKSCAPE_PKG_CONFIG_FIND(POPPLER poppler >=0.20.0 poppler-config.h poppler poppler)
if (POPPLER_FOUND)
- INKSCAPE_PKG_CONFIG_FIND(POPPLER_GLIB poppler-glib >=0.5.9 poppler/glib/poppler.h "" poppler-glib)
+ INKSCAPE_PKG_CONFIG_FIND(POPPLER_GLIB poppler-glib >=0.20.0 poppler/glib/poppler.h "" poppler-glib)
if (POPPLER_GLIB_FOUND)
list(APPEND POPPLER_INCLUDE_DIRS ${POPPLER_GLIB_INCLUDE_DIRS})
list(APPEND POPPLER_LIBRARIES ${POPPLER_GLIB_LIBRARIES})
@@ -36,7 +36,7 @@ else (POPPLER_LIBRARIES AND POPPLER_INCLUDE_DIRS)
endif (CAIRO_SVG_FOUND)
endif (POPPLER_GLIB_FOUND)
if (ENABLE_POPPLER_CAIRO)
- INKSCAPE_PKG_CONFIG_FIND(POPPLER_CAIRO poppler-cairo >=0.5.9 cairo.h cairo cairo)
+ INKSCAPE_PKG_CONFIG_FIND(POPPLER_CAIRO poppler-cairo >=0.20.0 cairo.h cairo cairo)
if (POPPLER_GLIB_FOUND AND POPPLER_CAIRO_FOUND AND NOT CAIRO_SVG_FOUND)
list(APPEND POPPLER_INCLUDE_DIRS ${POPPLER_CAIRO_INCLUDE_DIRS})
list(APPEND POPPLER_LIBRARIES ${POPPLER_CAIRO_LIBRARIES})