[PATCH 2/3] Qt4Macros: improve basename extraction in QT4_ADD_DBUS_INTERFACES

[Rolf Eike Beer]

-convert the filename to lowercase before the extraction, this allows this to
 work even if the filename as uppercase ".XML" extension
-use get_filename_component(... NAME) to strip the path
---
 Modules/Qt4Macros.cmake |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/Modules/Qt4Macros.cmake b/Modules/Qt4Macros.cmake
index f867bc5..7170711 100644
--- a/Modules/Qt4Macros.cmake
+++ b/Modules/Qt4Macros.cmake
@@ -258,9 +258,10 @@ ENDMACRO(QT4_ADD_DBUS_INTERFACE)
 MACRO(QT4_ADD_DBUS_INTERFACES _sources)
   FOREACH (_current_FILE ${ARGN})
     GET_FILENAME_COMPONENT(_infile ${_current_FILE} ABSOLUTE)
+    GET_FILENAME_COMPONENT(_basename ${_current_FILE} NAME)
     # get the part before the ".xml" suffix
-    STRING(REGEX REPLACE "(.*[/\\.])?([^\\.]+)\\.xml" "\\2" _basename ${_current_FILE})
     STRING(TOLOWER ${_basename} _basename)
+    STRING(REGEX REPLACE "(.*\\.)?([^\\.]+)\\.xml" "\\2" _basename ${_basename})
     QT4_ADD_DBUS_INTERFACE(${_sources} ${_infile} ${_basename}interface)
   ENDFOREACH (_current_FILE)
 ENDMACRO(QT4_ADD_DBUS_INTERFACES)
-- 
1.7.7.3


--nextPart1461247.InGPZ1xcfm
Content-Disposition: attachment; filename="0003-Qt4Macros-add-some-quotes-to-prevent-damage-from-spa.patch"
Content-Transfer-Encoding: 7Bit
Content-Type: text/x-patch; charset="UTF-8"; name="0003-Qt4Macros-add-some-quotes-to-prevent-damage-from-spa.patch"