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)
---
 src/CMakeLists.txt                |  4 ++++
 src/extension/CMakeLists.txt      | 15 +--------------
 src/extension/dbus/CMakeLists.txt | 29 +++++++++++++++++++++++++++++
 3 files changed, 34 insertions(+), 14 deletions(-)
 create mode 100644 src/extension/dbus/CMakeLists.txt

(limited to 'src')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5c436cefb..e97ea8489 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -526,6 +526,10 @@ endif()
 
 add_dependencies(inkscape inkscape_version)
 
+if(WITH_DBUS)
+    add_dependencies(inkscape inkscape_dbus)
+endif()
+
 if (NOT "${WITH_EXT_GDL}")
     list (APPEND INKSCAPE_LIBS "gdl_LIB")
 endif()
diff --git a/src/extension/CMakeLists.txt b/src/extension/CMakeLists.txt
index 21e652563..86a192f47 100644
--- a/src/extension/CMakeLists.txt
+++ b/src/extension/CMakeLists.txt
@@ -244,20 +244,7 @@ if(WITH_IMAGE_MAGICK)
 endif()
 
 if(WITH_DBUS)
-	list(APPEND extension_SRC
-		dbus/application-interface.cpp
-		dbus/dbus-init.cpp
-		dbus/document-interface.cpp
-
-		# ------
-		# Header
-		dbus/application-interface.h
-		dbus/dbus-init.h
-		dbus/document-interface.h
-		dbus/wrapper/inkscape-dbus-wrapper.h
-	)
-
-	include_directories(dbus)
+        add_subdirectory(dbus)
 endif()
 
 # add_inkscape_lib(extension_LIB "${extension_SRC}")
diff --git a/src/extension/dbus/CMakeLists.txt b/src/extension/dbus/CMakeLists.txt
new file mode 100644
index 000000000..ad9e1fd7d
--- /dev/null
+++ b/src/extension/dbus/CMakeLists.txt
@@ -0,0 +1,29 @@
+if(WITH_DBUS)
+include_directories(${CMAKE_BINARY_DIR}/src/extension/dbus)
+set(dbus_SRC "")
+       list(APPEND dbus_SRC
+                application-interface.cpp
+                dbus-init.cpp
+                document-interface.cpp
+        )
+        add_custom_target(inkscape_dbus 
+            DEPENDS ${CMAKE_BINARY_DIR}/src/extension/dbus/application-server-glue.h ${CMAKE_BINARY_DIR}/src/extension/dbus/document-server-glue.h ${CMAKE_BINARY_DIR}/src/extension/dbus/document-client-glue.h 
+            )
+        add_custom_command(
+            OUTPUT ${CMAKE_BINARY_DIR}/src/extension/dbus/application-server-glue.h ${CMAKE_BINARY_DIR}/src/extension/dbus/document-server-glue.h ${CMAKE_BINARY_DIR}/src/extension/dbus/document-client-glue.h
+            DEPENDS ${CMAKE_SOURCE_DIR}/src/extension/dbus/application-interface.xml ${CMAKE_SOURCE_DIR}/src/extension/dbus/document-interface.xml
+            COMMAND dbus-binding-tool --mode=glib-server --output=${CMAKE_BINARY_DIR}/src/extension/dbus/application-server-glue.h --prefix=application_interface ${CMAKE_SOURCE_DIR}/src/extension/dbus/application-interface.xml
+            COMMAND dbus-binding-tool --mode=glib-server --output=${CMAKE_BINARY_DIR}/src/extension/dbus/document-server-glue.h --prefix=document_interface ${CMAKE_SOURCE_DIR}/src/extension/dbus/document-interface.xml
+            COMMAND dbus-binding-tool --mode=glib-client --output=${CMAKE_BINARY_DIR}/src/extension/dbus/document-client-glue.h --prefix=document_interface ${CMAKE_SOURCE_DIR}/src/extension/dbus/document-interface.xml
+        )
+        set_source_files_properties(
+                ${CMAKE_BINARY_DIR}/src/extension/dbus/application-server-glue.h
+                PROPERTIES GENERATED TRUE)
+        set_source_files_properties(
+                ${CMAKE_BINARY_DIR}/src/extension/dbus/document-server-glue.h
+                PROPERTIES GENERATED TRUE)
+        set_source_files_properties(
+                ${CMAKE_BINARY_DIR}/src/extension/dbus/document-client-glue.h
+                PROPERTIES GENERATED TRUE)
+add_inkscape_source("${dbus_SRC}")
+endif()
-- 
cgit v1.2.3