← Back to branch summary

~inkscape.dev/inkscape/trunk

« back to all changes in this revision

Viewing changes to CMakeScripts/DefineDependsandFlags.cmake

  • Committer: Josh Andler
  • Author(s): Shlomi Fish
  • Date: 2014-11-25 22:02:51 UTC
  • Revision ID: scislac@gmail.com-20141125220251-6le2tiaxj9zu4w1u
https://launchpad.net/bugs/1378843
Patch from comment 4. Fixes build with cmake and poppler-0.26.4.

Show diffs side-by-side

added added

removed removed

Lines of Context:
CMakeScripts/DefineDependsandFlags.cmake
46
46
endif()
47
47
 
48
48
if(ENABLE_LCMS)
49
 
        find_package(LCMS)
50
 
        if(LCMS_FOUND)
51
 
                list(APPEND INKSCAPE_INCS_SYS ${LCMS_INCLUDE_DIRS})
52
 
                list(APPEND INKSCAPE_LIBS ${LCMS_LIBRARIES})
53
 
                add_definitions(${LCMS_DEFINITIONS})
 
49
        find_package(LCMS2)
 
50
        if(LCMS2_FOUND)
 
51
                list(APPEND INKSCAPE_INCS_SYS ${LCMS2_INCLUDE_DIRS})
 
52
                list(APPEND INKSCAPE_LIBS ${LCMS2_LIBRARIES})
 
53
                add_definitions(${LCMS2_DEFINITIONS})
 
54
        set (HAVE_LIBLCMS2 1)
54
55
        else()
55
 
                set(ENABLE_LCMS OFF)
56
 
        endif()
 
56
        find_package(LCMS)
 
57
        if(LCMS_FOUND)
 
58
            list(APPEND INKSCAPE_INCS_SYS ${LCMS_INCLUDE_DIRS})
 
59
            list(APPEND INKSCAPE_LIBS ${LCMS_LIBRARIES})
 
60
            add_definitions(${LCMS_DEFINITIONS})
 
61
            set (HAVE_LIBLCMS1 1)
 
62
        else()
 
63
            set(ENABLE_LCMS OFF)
 
64
        endif()
 
65
    endif()
57
66
endif()
58
67
 
59
68
find_package(BoehmGC REQUIRED)
81
90
                   POPPLER_VERSION VERSION_EQUAL   "0.12.2")
82
91
                        set(POPPLER_NEW_COLOR_SPACE_API ON)
83
92
                endif()
 
93
                if(POPPLER_VERSION VERSION_GREATER "0.26.0" OR
 
94
                   POPPLER_VERSION VERSION_EQUAL   "0.26.0")
 
95
                        set(POPPLER_EVEN_NEWER_COLOR_SPACE_API ON)
 
96
                endif()
84
97
                if(POPPLER_VERSION VERSION_GREATER "0.15.1" OR
85
98
                   POPPLER_VERSION VERSION_EQUAL   "0.15.1")
86
99
                        set(POPPLER_NEW_GFXPATCH ON)
163
176
        ${GTK2_CAIROMM_INCLUDE_DIR}
164
177
        ${GTK2_CAIROMMCONFIG_INCLUDE_DIR} # <-- not in cmake 2.8.4
165
178
        ${GTK2_GIOMM_INCLUDE_DIR}
 
179
        ${GTK2_GIOMMCONFIG_INCLUDE_DIR}
166
180
        ${GTK2_SIGC++_INCLUDE_DIR}
167
181
        ${GTK2_SIGC++CONFIG_INCLUDE_DIR}
168
182
)