From eeed7483385d14192bb11ef501bc729c286da7c5 Mon Sep 17 00:00:00 2001
From: Marc Jeanmougin <marc@jeanmougin.fr>
Date: Sat, 16 Apr 2016 16:39:29 +0200
Subject: CMake build: builds with WITH_DBUS

(bzr r14853)
---
 CMakeScripts/ConfigChecks.cmake          |  3 +--
 CMakeScripts/DefineDependsandFlags.cmake | 10 ++++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'CMakeScripts')

diff --git a/CMakeScripts/ConfigChecks.cmake b/CMakeScripts/ConfigChecks.cmake
index 926dc3ad3..34396ef28 100644
--- a/CMakeScripts/ConfigChecks.cmake
+++ b/CMakeScripts/ConfigChecks.cmake
@@ -65,7 +65,6 @@ if(HAVE_CAIRO_PDF)
     set(RENDER_WITH_PANGO_CAIRO TRUE)
 endif()
 
-# Create the two configuration files: config.h and inkscape_version.h
-# Create them in the binary root dir
+# Create the configuration files config.h in the binary root dir
 configure_file(${CMAKE_SOURCE_DIR}/config.h.cmake ${CMAKE_BINARY_DIR}/include/config.h)
 add_definitions(-DHAVE_CONFIG_H)
diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake
index 204f96c02..8e1cf2826 100644
--- a/CMakeScripts/DefineDependsandFlags.cmake
+++ b/CMakeScripts/DefineDependsandFlags.cmake
@@ -183,11 +183,13 @@ else(POTRACE_FOUND)
 endif()
 
 if(WITH_DBUS)
-    find_package(DBus REQUIRED)
+    pkg_check_modules(DBUS dbus-1 dbus-glib-1)
     if(DBUS_FOUND)
-	list(APPEND INKSCAPE_INCS_SYS ${DBUS_INCLUDE_DIR})
-	list(APPEND INKSCAPE_INCS_SYS ${DBUS_ARCH_INCLUDE_DIR})
-	list(APPEND INKSCAPE_LIBS ${DBUS_LIBRARIES})
+    list(APPEND INKSCAPE_LIBS ${DBUS_LDFLAGS})
+    list(APPEND INKSCAPE_INCS_SYS ${DBUS_INCLUDE_DIRS} ${CMAKE_BINARY_DIR}/src/extension/dbus/)
+    list(APPEND INKSCAPE_LIBS ${DBUS_LIBRARIES})
+    add_definitions(${DBUS_CFLAGS_OTHER})
+    
     else()
 	set(WITH_DBUS OFF)
     endif()
-- 
cgit v1.2.3