[Cmake-commits] CMake branch, next, updated. v2.8.6-1480-g17cb6c7

[Stephen Kelly]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  17cb6c7b042a9bfe681bc51e959eada9c6ea680d (commit)
       via  648c4544542ff54b3d5c498f36acae970edf0ae0 (commit)
      from  016b26db58f3c5ba451e33df2038b24b9dad672d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=17cb6c7b042a9bfe681bc51e959eada9c6ea680d
commit 17cb6c7b042a9bfe681bc51e959eada9c6ea680d
Merge: 016b26d 648c454
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 4 22:10:31 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 4 22:10:31 2011 -0400

    Merge topic 'qt_dbus_interface_args' into next
    
    648c454 Add features from KDE for arguments to qdbusxml2cpp.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=648c4544542ff54b3d5c498f36acae970edf0ae0
commit 648c4544542ff54b3d5c498f36acae970edf0ae0
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Sep 5 21:58:29 2011 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Sep 5 21:59:13 2011 +0200

    Add features from KDE for arguments to qdbusxml2cpp.

diff --git a/Modules/Qt4Macros.cmake b/Modules/Qt4Macros.cmake
index 6d7a3ec..630a0ba 100644
--- a/Modules/Qt4Macros.cmake
+++ b/Modules/Qt4Macros.cmake
@@ -216,9 +216,22 @@ MACRO(QT4_ADD_DBUS_INTERFACE _sources _interface _basename)
   SET(_impl   ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.cpp)
   SET(_moc    ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.moc)
 
-  # handling more arguments (as in FindQt4.cmake from KDE4) will come soon, then
-  # _params will be used for more than just -m
-  SET(_params -m)
+  GET_SOURCE_FILE_PROPERTY(_nonamespace ${_interface} NO_NAMESPACE)
+  IF(_nonamespace)
+    SET(_params -N -m)
+  ELSE(_nonamespace)
+    SET(_params -m)
+  ENDIF(_nonamespace)
+
+  GET_SOURCE_FILE_PROPERTY(_classname ${_interface} CLASSNAME)
+  IF(_classname)
+    SET(_params ${_params} -c ${_classname})
+  ENDIF(_classname)
+
+  GET_SOURCE_FILE_PROPERTY(_include ${_interface} INCLUDE)
+  IF(_include)
+    SET(_params ${_params} -i ${_include})
+  ENDIF(_include)
 
   ADD_CUSTOM_COMMAND(OUTPUT ${_impl} ${_header}
       COMMAND ${QT_DBUSXML2CPP_EXECUTABLE} ${_params} -p ${_basename} ${_infile}

-----------------------------------------------------------------------

Summary of changes:
 Modules/Qt4Macros.cmake |   19 ++++++++++++++++---
 1 files changed, 16 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake