From 58f983fca83ecedd8f0f424326261a80090153f4 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Tue, 4 Jul 2006 18:45:25 +0000 Subject: make the optional parameter ofr qt4_add_dbus_adaptor() actually work Alex svn path=/trunk/KDE/kdelibs/; revision=558130 --- modules/FindQt4.cmake | 9 +++++---- 1 file 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) -- cgit v1.2.1