diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2007-09-19 14:20:12 +0000 |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2007-09-19 14:20:12 +0000 |
| commit | c3533d11af49c55fff2212ced0bffe5e11583dfa (patch) | |
| tree | 711ee703c8266b4d32839c5d4b39d20969e9d9a6 /modules | |
| parent | f5d237a37d9b3f9e5a60e862c1ad707ed85d0f9b (diff) | |
| download | extra-cmake-modules-c3533d11af49c55fff2212ced0bffe5e11583dfa.tar.gz extra-cmake-modules-c3533d11af49c55fff2212ced0bffe5e11583dfa.tar.bz2 | |
-make QT4_ADD_DBUS_INTERFACES work not-by-accident and remove some unnecessary code
Alex
svn path=/trunk/KDE/kdelibs/; revision=714423
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/FindQt4.cmake | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/modules/FindQt4.cmake b/modules/FindQt4.cmake index 36d63383..a9a19048 100644 --- a/modules/FindQt4.cmake +++ b/modules/FindQt4.cmake @@ -1047,26 +1047,19 @@ IF (QT4_QMAKE_FOUND) QT4_ADD_DBUS_INTERFACE(${_sources} ${_interface} ${_basename}) ENDMACRO(QT4_ADD_DBUS_INTERFACE_NO_NAMESPACE) - # Internal (avoid to duplicate code between QT4_ADD_DBUS_INTERFACES_NO_NAMESPACE and QT4_ADD_DBUS_INTERFACES - MACRO(_QT4_ADD_DBUS_INTERFACES _sources _filename) - GET_FILENAME_COMPONENT(_infile ${_filename} ABSOLUTE) + MACRO(QT4_ADD_DBUS_INTERFACES _sources) + FOREACH (_current_FILE ${ARGN}) + GET_FILENAME_COMPONENT(_infile ${_current_FILE} ABSOLUTE) # get the part before the ".xml" suffix STRING(REGEX REPLACE "(.*[/\\.])?([^\\.]+)\\.xml" "\\2" _basename ${_current_FILE}) STRING(TOLOWER ${_basename} _basename) - QT4_ADD_DBUS_INTERFACE(${_sources} ${_infile} ${_basename}interface) - ENDMACRO(_QT4_ADD_DBUS_INTERFACES) - - MACRO(QT4_ADD_DBUS_INTERFACES _sources) - FOREACH (_current_FILE ${ARGN}) - _QT4_ADD_DBUS_INTERFACES(${_sources} ${_current_FILE}) + QT4_ADD_DBUS_INTERFACE(${_sources} ${_infile} ${_basename}interface) ENDFOREACH (_current_FILE) - ENDMACRO(QT4_ADD_DBUS_INTERFACES) + ENDMACRO(_QT4_ADD_DBUS_INTERFACES) MACRO(QT4_ADD_DBUS_INTERFACES_NO_NAMESPACE _sources) - FOREACH (_current_FILE ${ARGN}) - SET_SOURCE_FILES_PROPERTIES(${_current_FILE} PROPERTIES NO_NAMESPACE TRUE) - _QT4_ADD_DBUS_INTERFACES(${_sources} ${_current_FILE}) - ENDFOREACH (_current_FILE) + SET_SOURCE_FILES_PROPERTIES(${ARGN} PROPERTIES NO_NAMESPACE TRUE) + QT4_ADD_DBUS_INTERFACES(${_sources} ${ARGN}) ENDMACRO(QT4_ADD_DBUS_INTERFACES_NO_NAMESPACE) MACRO(QT4_GENERATE_DBUS_INTERFACE _header) # _customName ) |