diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-07-16 14:41:56 +0000 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-07-16 14:41:56 +0000 |
| commit | 66eb2eef866c736ad480b97765c3e44f4477b532 (patch) | |
| tree | 34d054422bcafeb9672a6286423b192fed127fb8 | |
| parent | fix for building with cmake and building without lcms works again. (diff) | |
| download | inkscape-66eb2eef866c736ad480b97765c3e44f4477b532.tar.gz inkscape-66eb2eef866c736ad480b97765c3e44f4477b532.zip | |
added WITH_GNOME_VFS as an option for cmake
(bzr r10460)
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | CMakeScripts/DefineDependsandFlags.cmake | 12 |
2 files changed, 10 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index da207016a..05ea532d0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -36,6 +36,7 @@ set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib CACHE INTERNAL "" FORCE ) # Options # ----------------------------------------------------------------------------- option(WITH_DBUS "Compile with support for DBus interface" OFF) +option(WITH_GNOME_VFS "Compile with support for Gnome VFS" OFF) #option(WITH_INKJAR "Enable support for openoffice files (SVG jars)" ON) option(WITH_PROFILING "Turn on profiling" OFF) # Set to true if compiler/linker should enable profiling diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake index 40c759741..b646c1679 100644 --- a/CMakeScripts/DefineDependsandFlags.cmake +++ b/CMakeScripts/DefineDependsandFlags.cmake @@ -20,9 +20,15 @@ list(APPEND INKSCAPE_INCS_SYS ${GSL_INCLUDE_DIRS}) list(APPEND INKSCAPE_LIBS ${GSL_LIBRARIES}) list(APPEND INKSCAPE_LIBS "-lgslcblas") # FIXME -find_package(GnomeVFS2) -list(APPEND INKSCAPE_INCS_SYS ${GNOMEVFS2_INCLUDE_DIR}) -list(APPEND INKSCAPE_LIBS ${GNOMEVFS-2_LIBRARY}) +if(WITH_GNOME_VFS) + find_package(GnomeVFS2) + if(GNOMEVFS2_FOUND) + list(APPEND INKSCAPE_INCS_SYS ${GNOMEVFS2_INCLUDE_DIR}) + list(APPEND INKSCAPE_LIBS ${GNOMEVFS-2_LIBRARY}) + else() + set(WITH_GNOME_VFS OFF) + endif() +endif() find_package(BoehmGC REQUIRED) list(APPEND INKSCAPE_INCS_SYS ${BOEHMGC_INCLUDE_DIRS}) |