diff options
| author | Luca Bruno <lucab@debian.org> | 2012-06-30 19:43:45 +0000 |
|---|---|---|
| committer | Luca Bruno <lucab@debian.org> | 2012-06-30 19:43:45 +0000 |
| commit | 8ccb359f4d190740e7c56cc5a145b5a8f67d14b3 (patch) | |
| tree | fe7daf717d89fe762f58583b36af0e00a8287ece /CMakeScripts | |
| parent | Allow cairomm 1.9.8. Should be good enough (diff) | |
| download | inkscape-8ccb359f4d190740e7c56cc5a145b5a8f67d14b3.tar.gz inkscape-8ccb359f4d190740e7c56cc5a145b5a8f67d14b3.zip | |
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)
Diffstat (limited to 'CMakeScripts')
| -rw-r--r-- | CMakeScripts/DefineDependsandFlags.cmake | 4 |
1 files changed, 4 insertions, 0 deletions
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() |