[Cmake-commits] [cmake-commits] alex committed FindQt4.cmake 1.169 1.170

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv14578/Modules

Modified Files:
	FindQt4.cmake 
Log Message:
-add the additional features for the dbus macros from KDE's FindQt4.cmake

Alex


Index: FindQt4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindQt4.cmake,v
retrieving revision 1.169
retrieving revision 1.170
diff -C 2 -d -r1.169 -r1.170
*** FindQt4.cmake	1 Oct 2009 20:48:19 -0000	1.169
--- FindQt4.cmake	3 Oct 2009 16:04:15 -0000	1.170
***************
*** 99,114 ****
  #        the name will be automatically determined from the name of the xml file
  #
! #  macro QT4_ADD_DBUS_ADAPTOR(outfiles xmlfile parentheader parentclassname [basename] )
  #        create a dbus adaptor (header and implementation file) from the xml file
  #        describing the interface, and add it to the list of sources. The adaptor
  #        forwards the calls to a parent class, defined in parentheader and named
  #        parentclassname. The name of the generated files will be
! #        <basename>adaptor.{cpp,h} where basename is the basename of the xml file.
  #
! #  macro QT4_GENERATE_DBUS_INTERFACE( header [interfacename] )
  #        generate the xml interface file from the given header.
  #        If the optional argument interfacename is omitted, the name of the 
  #        interface file is constructed from the basename of the header with
  #        the suffix .xml appended.
  #
  #  macro QT4_CREATE_TRANSLATION( qm_files directories ... sources ... 
--- 99,117 ----
  #        the name will be automatically determined from the name of the xml file
  #
! #  macro QT4_ADD_DBUS_ADAPTOR(outfiles xmlfile parentheader parentclassname [basename] [classname])
  #        create a dbus adaptor (header and implementation file) from the xml file
  #        describing the interface, and add it to the list of sources. The adaptor
  #        forwards the calls to a parent class, defined in parentheader and named
  #        parentclassname. The name of the generated files will be
! #        <basename>adaptor.{cpp,h} where basename defaults to the basename of the xml file.
! #        If <classname> is provided, then it will be used as the classname of the
! #        adaptor itself.
  #
! #  macro QT4_GENERATE_DBUS_INTERFACE( header [interfacename] OPTIONS ...)
  #        generate the xml interface file from the given header.
  #        If the optional argument interfacename is omitted, the name of the 
  #        interface file is constructed from the basename of the header with
  #        the suffix .xml appended.
+ #        Options may be given to qdbuscpp2xml, such as those found when executing "qdbuscpp2xml --help"
  #
  #  macro QT4_CREATE_TRANSLATION( qm_files directories ... sources ... 
***************
*** 1079,1082 ****
--- 1082,1086 ----
    
    MACRO (QT4_GENERATE_MOC infile outfile )
+   # get include dirs and flags
       QT4_GET_MOC_FLAGS(moc_flags)
       GET_FILENAME_COMPONENT(abs_infile ${infile} ABSOLUTE)
***************
*** 1186,1191 ****
    
    
!   MACRO(QT4_GENERATE_DBUS_INTERFACE _header) # _customName )
!     SET(_customName "${ARGV1}")
      GET_FILENAME_COMPONENT(_in_file ${_header} ABSOLUTE)
      GET_FILENAME_COMPONENT(_basename ${_header} NAME_WE)
--- 1190,1196 ----
    
    
!   MACRO(QT4_GENERATE_DBUS_INTERFACE _header) # _customName OPTIONS -some -options )
!     QT4_EXTRACT_OPTIONS(_customName _qt4_dbus_options ${ARGN})
! 
      GET_FILENAME_COMPONENT(_in_file ${_header} ABSOLUTE)
      GET_FILENAME_COMPONENT(_basename ${_header} NAME_WE)
***************
*** 1198,1202 ****
    
      ADD_CUSTOM_COMMAND(OUTPUT ${_target}
!         COMMAND ${QT_DBUSCPP2XML_EXECUTABLE} -o ${_target} ${_in_file}
          DEPENDS ${_in_file}
      )
--- 1203,1207 ----
    
      ADD_CUSTOM_COMMAND(OUTPUT ${_target}
!         COMMAND ${QT_DBUSCPP2XML_EXECUTABLE} ${_qt4_dbus_options} ${_in_file} -o ${_target}
          DEPENDS ${_in_file}
      )
***************
*** 1204,1208 ****
    
    
!   MACRO(QT4_ADD_DBUS_ADAPTOR _sources _xml_file _include _parentClass) # _optionalBasename )
      GET_FILENAME_COMPONENT(_infile ${_xml_file} ABSOLUTE)
      
--- 1209,1213 ----
    
    
!   MACRO(QT4_ADD_DBUS_ADAPTOR _sources _xml_file _include _parentClass) # _optionalBasename _optionalClassName)
      GET_FILENAME_COMPONENT(_infile ${_xml_file} ABSOLUTE)
      
***************
*** 1265,1268 ****
--- 1270,1274 ----
                 FOREACH (_current_MOC_INC ${_match})
                    STRING(REGEX MATCH "[^ <\"]+\\.moc" _current_MOC "${_current_MOC_INC}")
+ 
                    GET_FILENAME_COMPONENT(_basename ${_current_MOC} NAME_WE)
                    IF(EXISTS ${_abs_PATH}/${_basename}.hpp)