1
0
Эх сурвалжийг харах

Add features from KDE for arguments to qdbusxml2cpp.

Stephen Kelly 14 жил өмнө
parent
commit
648c454454

+ 16 - 3
Modules/Qt4Macros.cmake

@@ -216,9 +216,22 @@ MACRO(QT4_ADD_DBUS_INTERFACE _sources _interface _basename)
   SET(_impl   ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.cpp)
   SET(_impl   ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.cpp)
   SET(_moc    ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.moc)
   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}
   ADD_CUSTOM_COMMAND(OUTPUT ${_impl} ${_header}
       COMMAND ${QT_DBUSXML2CPP_EXECUTABLE} ${_params} -p ${_basename} ${_infile}
       COMMAND ${QT_DBUSXML2CPP_EXECUTABLE} ${_params} -p ${_basename} ${_infile}