diff options
| author | Shlomi Fish <shlomif@shlomifish.org> | 2014-11-25 22:02:51 +0000 |
|---|---|---|
| committer | Josh Andler <scislac@gmail.com> | 2014-11-25 22:02:51 +0000 |
| commit | 12cbd62d446d3f243c2b1623030df58f7319c594 (patch) | |
| tree | 3b127dda2123052a66692f8dcc2f5922faf80e62 /CMakeScripts | |
| parent | More c++ string usage. (diff) | |
| download | inkscape-12cbd62d446d3f243c2b1623030df58f7319c594.tar.gz inkscape-12cbd62d446d3f243c2b1623030df58f7319c594.zip | |
Patch from comment 4. Fixes build with cmake and poppler-0.26.4.
Fixed bugs:
- https://launchpad.net/bugs/1378843
(bzr r13764)
Diffstat (limited to 'CMakeScripts')
| -rw-r--r-- | CMakeScripts/DefineDependsandFlags.cmake | 28 |
1 files changed, 21 insertions, 7 deletions
diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake index a0e66c579..12f0b5240 100644 --- a/CMakeScripts/DefineDependsandFlags.cmake +++ b/CMakeScripts/DefineDependsandFlags.cmake @@ -46,14 +46,23 @@ if(WITH_GNOME_VFS) endif() if(ENABLE_LCMS) - find_package(LCMS) - if(LCMS_FOUND) - list(APPEND INKSCAPE_INCS_SYS ${LCMS_INCLUDE_DIRS}) - list(APPEND INKSCAPE_LIBS ${LCMS_LIBRARIES}) - add_definitions(${LCMS_DEFINITIONS}) + find_package(LCMS2) + if(LCMS2_FOUND) + list(APPEND INKSCAPE_INCS_SYS ${LCMS2_INCLUDE_DIRS}) + list(APPEND INKSCAPE_LIBS ${LCMS2_LIBRARIES}) + add_definitions(${LCMS2_DEFINITIONS}) + set (HAVE_LIBLCMS2 1) else() - set(ENABLE_LCMS OFF) - endif() + find_package(LCMS) + if(LCMS_FOUND) + list(APPEND INKSCAPE_INCS_SYS ${LCMS_INCLUDE_DIRS}) + list(APPEND INKSCAPE_LIBS ${LCMS_LIBRARIES}) + add_definitions(${LCMS_DEFINITIONS}) + set (HAVE_LIBLCMS1 1) + else() + set(ENABLE_LCMS OFF) + endif() + endif() endif() find_package(BoehmGC REQUIRED) @@ -81,6 +90,10 @@ if(ENABLE_POPPLER) POPPLER_VERSION VERSION_EQUAL "0.12.2") set(POPPLER_NEW_COLOR_SPACE_API ON) endif() + if(POPPLER_VERSION VERSION_GREATER "0.26.0" OR + POPPLER_VERSION VERSION_EQUAL "0.26.0") + set(POPPLER_EVEN_NEWER_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) @@ -163,6 +176,7 @@ list(APPEND INKSCAPE_INCS_SYS ${GTK2_CAIROMM_INCLUDE_DIR} ${GTK2_CAIROMMCONFIG_INCLUDE_DIR} # <-- not in cmake 2.8.4 ${GTK2_GIOMM_INCLUDE_DIR} + ${GTK2_GIOMMCONFIG_INCLUDE_DIR} ${GTK2_SIGC++_INCLUDE_DIR} ${GTK2_SIGC++CONFIG_INCLUDE_DIR} ) |