From 66eb2eef866c736ad480b97765c3e44f4477b532 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 17 Jul 2011 00:41:56 +1000 Subject: added WITH_GNOME_VFS as an option for cmake (bzr r10460) --- CMakeLists.txt | 1 + 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}) -- cgit v1.2.3