dbus-to-c.xsl is now installed so it can be used by external agents.
generate_dbus_headers macro is verbatim to made any errors visible.
Signed-off-by: Radek Novacek <rnovacek(a)redhat.com>
---
src/CMakeLists.txt | 1 +
src/cmake/modules/MatahariMacros.cmake | 7 ++++++-
2 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ed379c0..4b3857c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -158,6 +158,7 @@ endif(WITH-QMF)
if(WITH-DBUS)
install(FILES schema-to-dbus.xsl DESTINATION share/matahari)
+ install(FILES dbus-to-c.xsl DESTINATION share/matahari)
install(FILES include/matahari/mh_dbus_common.h DESTINATION include/matahari)
install(FILES include/matahari/mh_gobject_class.h DESTINATION include/matahari)
endif(WITH-DBUS)
diff --git a/src/cmake/modules/MatahariMacros.cmake
b/src/cmake/modules/MatahariMacros.cmake
index 3c5a428..2cd2232 100644
--- a/src/cmake/modules/MatahariMacros.cmake
+++ b/src/cmake/modules/MatahariMacros.cmake
@@ -7,6 +7,9 @@
macro(generate_dbus_headers API XML)
find_file(XSLTPROC xsltproc)
find_file(BIND_TOOL dbus-binding-tool)
+ find_file(DBUS_TO_C dbus-to-c.xsl
+ ${CMAKE_CURRENT_SOURCE_DIR}/..
+ /usr/share/matahari)
# Convert dbus interface to glue and properties files
add_custom_command(
@@ -15,14 +18,16 @@ macro(generate_dbus_headers API XML)
--output=${API}-dbus-glue.h
${XML}
COMMENT "Generating ${API}-dbus-glue.h"
+ VERBATIM
)
add_custom_command(
OUTPUT ${API}-dbus-properties.h
COMMAND ${XSLTPROC} --output ${API}-dbus-properties.h
- ${CMAKE_CURRENT_SOURCE_DIR}/../dbus-to-c.xsl
+ ${DBUS_TO_C}
${XML}
COMMENT "Generating ${API}-dbus-properties.h"
+ VERBATIM
)
endmacro(generate_dbus_headers)
--
1.7.5.1