diff options
| author | Pino Toscano <pino@kde.org> | 2010-03-07 17:34:40 +0100 |
|---|---|---|
| committer | Pino Toscano <pino@kde.org> | 2010-03-07 17:34:40 +0100 |
| commit | bbcbb34fec10c90edd5960bdbcc6849bc8f39526 (patch) | |
| tree | 970f728c18b212a57649dfd24c15c458fd92051b /CMakeLists.txt | |
| parent | 190fa971c12ca1b3007f6ba349a77a7c15c47490 (diff) | |
[CMake] set POPPLER_GLIB_DISABLE_DEPRECATED and POPPLER_GLIB_DISABLE_SINGLE_INCLUDES as done with autotools
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index e1aaf3e4..0a2b539f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -85,14 +85,20 @@ if(CAIRO_FOUND) set(HAVE_CAIRO ${CAIRO_FOUND}) set(CAIRO_FEATURE "#define POPPLER_HAS_CAIRO 1") set(CAIRO_REQ "cairo") + set(POPPLER_GLIB_DISABLE_DEPRECATED "") + set(POPPLER_GLIB_DISABLE_SINGLE_INCLUDES "") macro_optional_find_package(GTK) if(GLIB_FOUND) set(ENABLE_GLIB ON) set(GLIB_REQ "glib-2.0 >= ${GLIB_VERSION} gobject-2.0 >= ${GLIB_VERSION} cairo >= ${CAIRO_VERSION}") + set(POPPLER_GLIB_DISABLE_DEPRECATED "${POPPLER_GLIB_DISABLE_DEPRECATED} -DG_DISABLE_DEPRECATED") + set(POPPLER_GLIB_DISABLE_SINGLE_INCLUDES "${POPPLER_GLIB_DISABLE_SINGLE_INCLUDES} -DG_DISABLE_SINGLE_INCLUDES") if(GDK_FOUND) set(GDK_REQ "gdk-2.0 gdk-pixbuf-2.0") set(POPPLER_WITH_GDK ${GDK_FOUND}) set(GDK_FEATURE "#define POPPLER_WITH_GDK 1") + set(POPPLER_GLIB_DISABLE_DEPRECATED "${POPPLER_GLIB_DISABLE_DEPRECATED} -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED") + set(POPPLER_GLIB_DISABLE_SINGLE_INCLUDES "${POPPLER_GLIB_DISABLE_SINGLE_INCLUDES} -DGTK_DISABLE_SINGLE_INCLUDES") endif(GDK_FOUND) endif(GLIB_FOUND) else(CAIRO_FOUND) |