From 897d0021dc002afb5b64a2ab527cfc9ce6a13da7 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Tue, 3 Jul 2012 14:16:21 +0200 Subject: Improve basename extraction in qt5_add_dbus_interfaces This is a forward port of f46903b4b21e5d1c8af9a60e9ea87805b170ed73 in cmake.git. Change-Id: I627b17259182497c1353ccf4cd3fa4a61546be5d Reviewed-by: Clinton Stimpson Reviewed-by: Stephen Kelly --- src/dbus/Qt5DBusMacros.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/dbus/Qt5DBusMacros.cmake b/src/dbus/Qt5DBusMacros.cmake index 6617d370a9..17068c5cc0 100644 --- a/src/dbus/Qt5DBusMacros.cmake +++ b/src/dbus/Qt5DBusMacros.cmake @@ -73,9 +73,10 @@ endfunction() function(QT5_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}) qt5_add_dbus_interface(${_sources} ${_infile} ${_basename}interface) endforeach() set(${_sources} ${${_sources}} PARENT_SCOPE) -- cgit v1.2.3