ack, looks good
On Wed, May 25, 2011 at 4:54 PM, Radek Novacek <rnovacek(a)redhat.com> wrote:
Signed-off-by: Radek Novacek <rnovacek(a)redhat.com>
---
src/CMakeLists.txt | 8 --------
src/cmake/modules/MatahariMacros.cmake | 20 ++++++++------------
src/host/CMakeLists.txt | 5 ++++-
src/network/CMakeLists.txt | 5 ++++-
src/service/CMakeLists.txt | 5 ++++-
5 files changed, 20 insertions(+), 23 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4636ee2..6e29a08 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -113,14 +113,6 @@ else(WITH-DBUS STREQUAL "ON")
endif(NOT polkit_FOUND)
endif(WITH-DBUS STREQUAL "ON")
-if(WITH-DBUS)
- message(STATUS "DBus is enabled")
- # Create src/dbus directory and generate DBus XML definition files into it
- generate_dbus_interface(${SCHEMAS})
-else(WITH-DBUS)
- message(STATUS "DBus is disabled")
-endif(WITH-DBUS)
-
## qpid
if(WITH-QMF)
# Defines
diff --git a/src/cmake/modules/MatahariMacros.cmake
b/src/cmake/modules/MatahariMacros.cmake
index ea976eb..0c48b29 100644
--- a/src/cmake/modules/MatahariMacros.cmake
+++ b/src/cmake/modules/MatahariMacros.cmake
@@ -32,20 +32,16 @@ macro(generate_dbus_headers API XML)
endmacro(generate_dbus_headers)
# This macro will transform QMF interface XML to DBus interface XML file
-# Arguments SCHEMAS - paths to XML schema files
-macro(generate_dbus_interface SCHEMAS)
+# Argument SCHEMA - path to XML schema file
+macro(generate_dbus_interface SCHEMA)
find_file(SCHEMA_TO_DBUS schema-to-dbus.xsl
- ${CMAKE_CURRENT_SOURCE_DIR} /usr/share/matahari)
+ ${CMAKE_CURRENT_SOURCE_DIR}/.. /usr/share/matahari)
find_file(XSLTPROC xsltproc)
- # Create dbus subdirectory
- execute_process(COMMAND mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/dbus)
- foreach(SCHEMA ${SCHEMAS})
- # Generate files for each schema
- execute_process(
- COMMAND ${XSLTPROC} ${SCHEMA_TO_DBUS} ${SCHEMA}
- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/dbus
- )
- endforeach(SCHEMA ${SCHEMAS})
+ # Generate files
+ execute_process(
+ COMMAND ${XSLTPROC} ${SCHEMA_TO_DBUS} ${SCHEMA}
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+ )
endmacro(generate_dbus_interface)
# This macro will generate QMF definition files from QMF schema
diff --git a/src/host/CMakeLists.txt b/src/host/CMakeLists.txt
index 0e3f8c6..38f5e0f 100644
--- a/src/host/CMakeLists.txt
+++ b/src/host/CMakeLists.txt
@@ -33,7 +33,10 @@ endif(WITH-QMF)
# DBus daemon
if(WITH-DBUS)
# Auto-generated stuff
- generate_dbus_headers(${BASE}
${CMAKE_BINARY_DIR}/src/dbus/org.matahariproject.Host.xml)
+ generate_dbus_headers(${BASE}
${CMAKE_CURRENT_BINARY_DIR}/org.matahariproject.Host.xml)
+ # Create src/dbus directory and generate DBus XML definition files into it
+ generate_dbus_interface(${CMAKE_CURRENT_SOURCE_DIR}/schema.xml)
+
# Must be included to find matahari-API-dbus-properties.h
include_directories(${CMAKE_CURRENT_BINARY_DIR})
diff --git a/src/network/CMakeLists.txt b/src/network/CMakeLists.txt
index 8c9fc86..3791191 100644
--- a/src/network/CMakeLists.txt
+++ b/src/network/CMakeLists.txt
@@ -33,7 +33,10 @@ endif(WITH-QMF)
# DBus daemon
if(WITH-DBUS)
# Auto-generated stuff
- generate_dbus_headers(${BASE}
${CMAKE_BINARY_DIR}/src/dbus/org.matahariproject.Network.xml)
+ generate_dbus_headers(${BASE}
${CMAKE_CURRENT_BINARY_DIR}/org.matahariproject.Network.xml)
+ # Create src/dbus directory and generate DBus XML definition files into it
+ generate_dbus_interface(${CMAKE_CURRENT_SOURCE_DIR}/schema.xml)
+
# Must be included to find API-dbus-properties.h
include_directories(${CMAKE_CURRENT_BINARY_DIR})
diff --git a/src/service/CMakeLists.txt b/src/service/CMakeLists.txt
index 7f15a88..fba3cba 100644
--- a/src/service/CMakeLists.txt
+++ b/src/service/CMakeLists.txt
@@ -33,7 +33,10 @@ endif(WITH-QMF)
# DBus daemon
if(WITH-DBUS)
# Auto-generated stuff
- generate_dbus_headers(${BASE}
${CMAKE_BINARY_DIR}/src/dbus/org.matahariproject.Services.xml)
+ generate_dbus_headers(${BASE}
${CMAKE_CURRENT_BINARY_DIR}/org.matahariproject.Services.xml)
+ # Create src/dbus directory and generate DBus XML definition files into it
+ generate_dbus_interface(${CMAKE_CURRENT_SOURCE_DIR}/schema.xml)
+
# Must be included to find matahari-API-dbus-properties.h
include_directories(${CMAKE_CURRENT_BINARY_DIR})
--
1.7.5.1
_______________________________________________
Matahari mailing list
Matahari(a)lists.fedorahosted.org
https://fedorahosted.org/mailman/listinfo/matahari