From bd9cc9950b2cb841a3d0f92609f38a907133d31e Mon Sep 17 00:00:00 2001 From: su_v Date: Sat, 2 May 2015 10:35:25 +0200 Subject: cmake: fix build with poppler >= 0.29 (bzr r14089) --- CMakeScripts/DefineDependsandFlags.cmake | 4 ++++ config.h.cmake | 3 +++ 2 files changed, 7 insertions(+) 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 -- cgit v1.2.3