Use gdbus integration from cmake-extras.

unity8-team · Mar 6, 2017 · 93d3879 · 93d3879
1 parent 869ff24
commit 93d3879
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 82 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -18,11 +18,11 @@ set(PACKAGE ${CMAKE_PROJECT_NAME})
 set(GETTEXT_PACKAGE ${CMAKE_PROJECT_NAME})
 
 find_package(PkgConfig REQUIRED)
+find_package(GDbus)
 include(GNUInstallDirs)
 include(CheckIncludeFile)
 include(CheckFunctionExists)
 include(UseGlibGeneration)
-include(UseGdbusCodegen)
 include(UseConstantBuilder)
 
 # Workaround for libexecdir on debian

diff --git a/cmake/UseGdbusCodegen.cmake b/cmake/UseGdbusCodegen.cmake
diff --git a/liburl-dispatcher/CMakeLists.txt b/liburl-dispatcher/CMakeLists.txt
@@ -6,34 +6,6 @@
 set(API_VERSION 1)
 set(ABI_VERSION 1)
 
-###########################
-# Generated Lib
-###########################
-
-set(GENERATED_HEADERS
-service-iface.h
-)
-
-set(GENERATED_SOURCES
-service-iface.c
-)
-
-add_gdbus_codegen(
-OUTFILES GENERATED_SOURCES
-NAME service-iface
-PREFIX com.canonical.URLDispatcher.
-NAMESPACE ServiceIface
-SERVICE_XML ${CMAKE_CURRENT_SOURCE_DIR}/../data/com.canonical.URLDispatcher.xml
-)
-
-add_library(generated STATIC ${GENERATED_SOURCES})
-
-target_link_libraries(generated
-${GLIB2_LIBRARIES}
-${GOBJECT2_LIBRARIES}
-${GIO2_LIBRARIES}
-)
-
 ###########################
 # Lib
 ###########################
@@ -58,7 +30,7 @@ set_target_properties(dispatcher PROPERTIES
 )
 
 target_link_libraries(dispatcher
-generated
+service-generated
 ${GLIB2_LIBRARIES}
 ${GOBJECT2_LIBRARIES}
 -Wl,--no-undefined

diff --git a/service/CMakeLists.txt b/service/CMakeLists.txt
@@ -8,29 +8,20 @@ add_definitions( -DOVERLAY_SYSTEM_DIRECTORY="${CMAKE_INSTALL_FULL_DATADIR}/url-d
 # Generated Lib
 ###########################
 
-
-set(SERVICE_GENERATED_HEADERS
-service-iface.h
-)
-
-set(SERVICE_GENERATED_SOURCES
-service-iface.c
-)
-
 add_gdbus_codegen(
-OUTFILES SERVICE_GENERATED_SOURCES
-NAME service-iface
-PREFIX com.canonical.URLDispatcher.
-NAMESPACE ServiceIface
-SERVICE_XML ${CMAKE_CURRENT_SOURCE_DIR}/../data/com.canonical.URLDispatcher.xml
+  SERVICE_GENERATED
+  service-iface
+  com.canonical.URLDispatcher.
+  ${CMAKE_SOURCE_DIR}/data/com.canonical.URLDispatcher.xml
+  NAMESPACE ServiceIface
 )
 
 add_library(service-generated STATIC ${SERVICE_GENERATED_SOURCES})
 
 target_link_libraries(service-generated
-${GLIB2_LIBRARIES}
-${GOBJECT2_LIBRARIES}
-${GIO2_LIBRARIES}
+  ${GLIB2_LIBRARIES}
+  ${GOBJECT2_LIBRARIES}
+  ${GIO2_LIBRARIES}
 )
 
 ###########################