Removed generated dbus code and added call to gdbus-codegen in the build process

Signed-off-by: Chuck Claunch <[email protected]>

1 files changed, 17 insertions, 2 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 238549e..201d8ba 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -9,6 +9,7 @@ include_directories(
   ${GLIB2_INCLUDE_DIRS}
   ${GIO_INCLUDE_DIRS}
   ${GIO-UNIX_INCLUDE_DIRS}
+  ${CMAKE_CURRENT_BINARY_DIR}
 )
 
 set (tinyb_LIB_SRCS
@@ -22,15 +23,29 @@ set (tinyb_LIB_SRCS
   ${PROJECT_SOURCE_DIR}/src/BluetoothGattDescriptor.cpp
   ${PROJECT_SOURCE_DIR}/src/BluetoothUUID.cpp
   ${PROJECT_SOURCE_DIR}/src/tinyb_utils.cpp
-  ${PROJECT_SOURCE_DIR}/src/generated-code.c
-# autogenerated version file
+# autogenerated files
   ${CMAKE_CURRENT_BINARY_DIR}/version.c
+  ${CMAKE_CURRENT_BINARY_DIR}/orgbluez-dbus.c
 )
 
 set (tinyb_LIB_GLOB_HEADERS
   ${PROJECT_SOURCE_DIR}/api/tinyb.hpp
 )
 
+find_program(GDBUS_CODEGEN NAMES gdbus-codegen)
+if (NOT GDBUS_CODEGEN)
+  message(FATAL_ERROR "gdbus-codegen not found")
+else ()
+  message(STATUS "gdbus-codegen found")
+endif ()
+
+add_custom_command(OUTPUT orgbluez-dbus.c orgbluez-dbus.h
+  COMMAND ${GDBUS_CODEGEN} 
+    --interface-prefix org.bluez 
+    --generate-c-code orgbluez-dbus 
+    --c-generate-object-manager ${PROJECT_SOURCE_DIR}/src/org.bluez.xml
+  COMMENT "Generating dbus code from org.bluez.xml")
+
 add_library (tinyb SHARED ${tinyb_LIB_SRCS})
 target_link_libraries (
   tinyb