diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2006-07-04 18:45:25 +0000 |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2006-07-04 18:45:25 +0000 |
| commit | 58f983fca83ecedd8f0f424326261a80090153f4 (patch) | |
| tree | 21ea017d0f9a585a422d74c56f68469c893632c8 /modules/FindQt4.cmake | |
| parent | e1370e9c1c7b5d863a544acf44d8a469183a4413 (diff) | |
| download | extra-cmake-modules-58f983fca83ecedd8f0f424326261a80090153f4.tar.gz extra-cmake-modules-58f983fca83ecedd8f0f424326261a80090153f4.tar.bz2 | |
make the optional parameter ofr qt4_add_dbus_adaptor() actually work
Alex
svn path=/trunk/KDE/kdelibs/; revision=558130
Diffstat (limited to 'modules/FindQt4.cmake')
| -rw-r--r-- | modules/FindQt4.cmake | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/modules/FindQt4.cmake b/modules/FindQt4.cmake index 24dab37d..456c514f 100644 --- a/modules/FindQt4.cmake +++ b/modules/FindQt4.cmake @@ -886,12 +886,13 @@ IF (QT4_QMAKE_FOUND) MACRO(QT4_ADD_DBUS_ADAPTOR _sources _xml_file _include _parentClass) GET_FILENAME_COMPONENT(_infile ${_xml_file} ABSOLUTE) - IF (ARGV1) - SET(_basename ${ARGV1} ) - ELSE (ARGV1) + SET(_optionalBasename "${ARGV4}") + IF (_optionalBasename) + SET(_basename ${_optionalBasename} ) + ELSE (_optionalBasename) STRING(REGEX REPLACE "(.*[/\\.])?([^\\.]+)\\.xml" "\\2adaptor" _basename ${_infile}) STRING(TOLOWER ${_basename} _basename) - ENDIF (ARGV1) + ENDIF (_optionalBasename) SET(_header ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.h) SET(_impl ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.cpp) |