Merge lp:~pete-woods/cmake-extras/gdbus-conventional-appending-lp1671807 into lp:cmake-extras

[Pete Woods]

Switch to conventional generated source appending for GDbus macros

Switch to conventional generated source appending for GDbus macros

[dobey (dobey)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2017-02-28 17:48:01 +0000
+++ debian/changelog	2017-03-10 12:30:47 +0000
@@ -1,3 +1,9 @@
+cmake-extras (1.3-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Make GDBus source name generation work like more conventional macros.
+
+ -- Pete <[e-mail]>  Fri, 10 Mar 2017 12:21:39 +0000
+
 cmake-extras (1.2+17.04.20170228-0ubuntu1) zesty; urgency=medium
 
   * Add function to compile GSettings schemas. (LP: #1664714)
 
=== modified file 'examples/gdbus-demo/CMakeLists.txt'
--- examples/gdbus-demo/CMakeLists.txt	2017-02-24 19:55:58 +0000
+++ examples/gdbus-demo/CMakeLists.txt	2017-03-10 12:30:47 +0000
@@ -19,15 +19,19 @@
 include_directories(${GLIB_INCLUDE_DIRS})
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
+set(SOURCES
+  main.cpp
+)
+
 add_gdbus_codegen(
-  DBUS_STANDARD
+  SOURCES
   dbus-standard
   org.freedesktop
   org.freedesktop.DBus.xml
   )
 
 add_gdbus_codegen(
-  DBUS_NAMESPACED
+  SOURCES
   dbus-namespaced
   org.freedesktop
   org.freedesktop.DBus.xml
@@ -37,9 +41,7 @@
 add_executable(
   test-gdbus
 
-  main.cpp
-  ${DBUS_STANDARD_SOURCES}
-  ${DBUS_NAMESPACED_SOURCES}
+  ${SOURCES}
   )
 target_link_libraries(
   test-gdbus
 
=== modified file 'src/GDbus/GDbusConfig.cmake'
--- src/GDbus/GDbusConfig.cmake	2017-02-28 17:39:43 +0000
+++ src/GDbus/GDbusConfig.cmake	2017-03-10 12:30:47 +0000
@@ -41,23 +41,23 @@
 #.. command:: add_gdbus_codegen
 #
 #  Generates C code and header file from XML service description, and
-#  sets the :variable:<VARIABLE_PREFIX>_SOURCES variable with the newly
-#  generated source files. This variable should be added to the list of
-#  sources for your :command:add_executable or :command:add_library target.
+#  appends the sources to the SOURCES list provided.
 #
-#    add_gdbus_codegen(<VARIABLE_PREFIX> <NAME> <PREFIX> <SERVICE_XML> [NAMESPACE])
+#    add_gdbus_codegen(<SOURCES> <NAME> <PREFIX> <SERVICE_XML> [NAMESPACE])
 #
 #  For example:
 #
 #  .. code-block:: cmake
 #
-#   add_gdbus_codegen(DBUS_PROXY
+#   set(MY_SOURCES foo.c)
+#
+#   add_gdbus_codegen(MY_SOURCES
 #     dbus-proxy
 #     org.freedesktop
 #     org.freedesktop.DBus.xml
 #     )
 #
-function(ADD_GDBUS_CODEGEN VARIABLE_PREFIX NAME PREFIX SERVICE_XML)
+function(ADD_GDBUS_CODEGEN _SOURCES _NAME _PREFIX SERVICE_XML)
   set(_options ALL)
   set(_oneValueArgs NAMESPACE)
 
@@ -70,17 +70,23 @@
     set(_NAMESPACE "--c-namespace=${_ARG_NAMESPACE}")
   endif()
 
-  set(_OUTPUT_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/${NAME}")
+  set(_OUTPUT_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/${_NAME}")
   set(_OUTPUT_FILES "${_OUTPUT_PREFIX}.c" "${_OUTPUT_PREFIX}.h")
-  set("${VARIABLE_PREFIX}_SOURCES" "${_OUTPUT_FILES}" PARENT_SCOPE)
+
+  # for backwards compatibility
+  set("${_SOURCES}_SOURCES" "${_OUTPUT_FILES}" PARENT_SCOPE)
+
+
+  list(APPEND ${_SOURCES} ${_OUTPUT_FILES})
+  set(${_SOURCES} ${${_SOURCES}} PARENT_SCOPE)
+
   add_custom_command(
     OUTPUT ${_OUTPUT_FILES}
     COMMAND "${GDBUS_CODEGEN_EXECUTABLE}"
-        --interface-prefix ${PREFIX}
-        --generate-c-code="${NAME}"
+        --interface-prefix ${_PREFIX}
+        --generate-c-code="${_NAME}"
         ${_NAMESPACE}
         ${_ABS_SERVICE_XML}
-    BYPRODUCTS ${_OUTPUT_FILES}
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     DEPENDS ${_ABS_SERVICE_XML}
     )