From 8ccb359f4d190740e7c56cc5a145b5a8f67d14b3 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sat, 30 Jun 2012 21:43:45 +0200 Subject: Fix building with Poppler 0.20 (LP: #1005565) Poppler >= 0.20 has a new internal API for errors and other miscellanea. As we are abusing these internal functionalities, they broke from time to time. Fixing it for now with a new conditional build flag. This fixes https://bugs.launchpad.net/inkscape/+bug/1005565 (bzr r11518) --- CMakeScripts/DefineDependsandFlags.cmake | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'CMakeScripts') diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake index ccfff8a40..4c00057f8 100644 --- a/CMakeScripts/DefineDependsandFlags.cmake +++ b/CMakeScripts/DefineDependsandFlags.cmake @@ -78,6 +78,10 @@ if(POPPLER_FOUND) POPPLER_VERSION VERSION_EQUAL "0.15.1") set(POPPLER_NEW_GFXPATCH ON) endif() + if(POPPLER_VERSION VERSION_GREATER "0.20.0" OR + POPPLER_VERSION VERSION_EQUAL "0.20.0") + set(POPPLER_NEW_ERRORAPI ON) + endif() else() set(ENABLE_POPPLER_CAIRO OFF) endif() -- cgit v1.2.3