diff options
| author | su_v <suv-sf@users.sourceforge.net> | 2015-05-02 08:35:25 +0000 |
|---|---|---|
| committer | ~suv <suv-sf@users.sourceforge.net> | 2015-05-02 08:35:25 +0000 |
| commit | bd9cc9950b2cb841a3d0f92609f38a907133d31e (patch) | |
| tree | 6a2295404d7151e35f3a0c10319e87a563e221a1 | |
| parent | sp-text: Whitespace cleanup (diff) | |
| download | inkscape-bd9cc9950b2cb841a3d0f92609f38a907133d31e.tar.gz inkscape-bd9cc9950b2cb841a3d0f92609f38a907133d31e.zip | |
cmake: fix build with poppler >= 0.29
(bzr r14089)
| -rw-r--r-- | CMakeScripts/DefineDependsandFlags.cmake | 4 | ||||
| -rw-r--r-- | config.h.cmake | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake index 321f0982c..697f2166d 100644 --- a/CMakeScripts/DefineDependsandFlags.cmake +++ b/CMakeScripts/DefineDependsandFlags.cmake @@ -122,6 +122,10 @@ if(ENABLE_POPPLER) POPPLER_VERSION VERSION_EQUAL "0.26.0") set(POPPLER_EVEN_NEWER_COLOR_SPACE_API ON) endif() + if(POPPLER_VERSION VERSION_GREATER "0.29.0" OR + POPPLER_VERSION VERSION_EQUAL "0.29.0") + set(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API ON) + endif() if(POPPLER_VERSION VERSION_GREATER "0.15.1" OR POPPLER_VERSION VERSION_EQUAL "0.15.1") set(POPPLER_NEW_GFXPATCH ON) diff --git a/config.h.cmake b/config.h.cmake index 398608446..81712be63 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -137,6 +137,9 @@ /* Use color space API from Poppler >= 0.26.0 */ #cmakedefine POPPLER_EVEN_NEWER_COLOR_SPACE_API 1 +/* Use color space API from Poppler >= 0.29.0 */ +#cmakedefine POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API 1 + /* Use new error API from Poppler >= 0.20.0 */ #cmakedefine POPPLER_NEW_ERRORAPI |