diff options
| author | su_v <suv-sf@users.sourceforge.net> | 2012-12-16 05:41:25 +0000 |
|---|---|---|
| committer | ~suv <suv-sf@users.sourceforge.net> | 2012-12-16 05:41:25 +0000 |
| commit | 7ec903c9898f872dbd9426ed7a62e1969fdb7be7 (patch) | |
| tree | a306139e829118a83516af02279c9eafd3440eaa /CMakeScripts | |
| parent | Hershey Text: whitespace; py: docstring, modeline; inx: fix attribute value (diff) | |
| parent | Translations.Spanish translation update by Lucas Vieites. (diff) | |
| download | inkscape-7ec903c9898f872dbd9426ed7a62e1969fdb7be7.tar.gz inkscape-7ec903c9898f872dbd9426ed7a62e1969fdb7be7.zip | |
merge from trunk (r11955)
(bzr r11687.1.3)
Diffstat (limited to 'CMakeScripts')
| -rw-r--r-- | CMakeScripts/DefineDependsandFlags.cmake | 75 |
1 files changed, 43 insertions, 32 deletions
diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake index 4c00057f8..3a6b6c44f 100644 --- a/CMakeScripts/DefineDependsandFlags.cmake +++ b/CMakeScripts/DefineDependsandFlags.cmake @@ -19,14 +19,20 @@ find_package(GSL REQUIRED) list(APPEND INKSCAPE_INCS_SYS ${GSL_INCLUDE_DIRS}) list(APPEND INKSCAPE_LIBS ${GSL_LIBRARIES}) if (WIN32) - list(APPEND INKSCAPE_LIBS "-L$ENV{DEVLIBS_PATH}/lib") # FIXME - list(APPEND INKSCAPE_LIBS "-lgobject-2.0") # FIXME - list(APPEND INKSCAPE_LIBS "-lintl.dll") # FIXME - list(APPEND INKSCAPE_LIBS "-lpangocairo-1.0.dll") # FIXME - list(APPEND INKSCAPE_LIBS "-lpangoft2-1.0.dll") # FIXME - list(APPEND INKSCAPE_LIBS "-lpangowin32-1.0.dll") # FIXME - list(APPEND INKSCAPE_LIBS "-lgthread-2.0.dll") # FIXME + list(APPEND INKSCAPE_LIBS "-L$ENV{DEVLIBS_PATH}/lib") # FIXME + list(APPEND INKSCAPE_LIBS "-lintl.dll") # FIXME + list(APPEND INKSCAPE_LIBS "-lpangocairo-1.0.dll") # FIXME + list(APPEND INKSCAPE_LIBS "-lpangoft2-1.0.dll") # FIXME + list(APPEND INKSCAPE_LIBS "-lpangowin32-1.0.dll") # FIXME + list(APPEND INKSCAPE_LIBS "-lgthread-2.0.dll") # FIXME +else() + list(APPEND INKSCAPE_LIBS "-ldl") # FIXME + list(APPEND INKSCAPE_LIBS "-lpangocairo-1.0") # FIXME + list(APPEND INKSCAPE_LIBS "-lpangoft2-1.0") # FIXME + list(APPEND INKSCAPE_LIBS "-lfontconfig") # FIXME + list(APPEND INKSCAPE_LIBS "-lX11") # FIXME endif() + list(APPEND INKSCAPE_LIBS "-lgslcblas") # FIXME if(WITH_GNOME_VFS) @@ -55,34 +61,39 @@ list(APPEND INKSCAPE_INCS_SYS ${BOEHMGC_INCLUDE_DIRS}) list(APPEND INKSCAPE_LIBS ${BOEHMGC_LIBRARIES}) add_definitions(${BOEHMGC_DEFINITIONS}) -find_package(PopplerCairo) -if(POPPLER_FOUND) - set(HAVE_POPPLER ON) - if(ENABLE_POPPLER_CAIRO) - if(POPPLER_CAIRO_FOUND AND POPPLER_GLIB_FOUND) - set(HAVE_POPPLER_CAIRO ON) +if(ENABLE_POPPLER) + find_package(PopplerCairo) + if(POPPLER_FOUND) + set(HAVE_POPPLER ON) + if(ENABLE_POPPLER_CAIRO) + if(POPPLER_CAIRO_FOUND AND POPPLER_GLIB_FOUND) + set(HAVE_POPPLER_CAIRO ON) + endif() + if(POPPLER_GLIB_FOUND AND CAIRO_SVG_FOUND) + set(HAVE_POPPLER_GLIB ON) + endif() endif() - if(POPPLER_GLIB_FOUND AND CAIRO_SVG_FOUND) - set(HAVE_POPPLER_GLIB ON) + if(POPPLER_VERSION VERSION_GREATER "0.8.3" OR + POPPLER_VERSION VERSION_EQUAL "0.8.3") + set(POPPLER_NEW_GFXFONT ON) endif() - endif() - if(POPPLER_VERSION VERSION_GREATER "0.8.3" OR - POPPLER_VERSION VERSION_EQUAL "0.8.3") - set(POPPLER_NEW_GFXFONT ON) - endif() - if(POPPLER_VERSION VERSION_GREATER "0.12.2" OR - POPPLER_VERSION VERSION_EQUAL "0.12.2") - set(POPPLER_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) - endif() - if(POPPLER_VERSION VERSION_GREATER "0.20.0" OR - POPPLER_VERSION VERSION_EQUAL "0.20.0") - set(POPPLER_NEW_ERRORAPI ON) + if(POPPLER_VERSION VERSION_GREATER "0.12.2" OR + POPPLER_VERSION VERSION_EQUAL "0.12.2") + set(POPPLER_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) + endif() + if(POPPLER_VERSION VERSION_GREATER "0.20.0" OR + POPPLER_VERSION VERSION_EQUAL "0.20.0") + set(POPPLER_NEW_ERRORAPI ON) + endif() + else() + set(ENABLE_POPPLER_CAIRO OFF) endif() else() + set(HAVE_POPPLER OFF) set(ENABLE_POPPLER_CAIRO OFF) endif() @@ -172,7 +183,7 @@ list(APPEND INKSCAPE_LIBS ${GTK2_CAIROMM_LIBRARY} ${GTK2_GIOMM_LIBRARY} ${GTK2_SIGC++_LIBRARY} - + ${GTK2_GOBJECT_LIBRARY} ) |