diff options
Diffstat (limited to 'src/dbus/Qt6DBusMacros.cmake')
| -rw-r--r-- | src/dbus/Qt6DBusMacros.cmake | 31 |
1 files changed, 14 insertions, 17 deletions
diff --git a/src/dbus/Qt6DBusMacros.cmake b/src/dbus/Qt6DBusMacros.cmake index e4e8635dff..4f5373437a 100644 --- a/src/dbus/Qt6DBusMacros.cmake +++ b/src/dbus/Qt6DBusMacros.cmake @@ -76,14 +76,13 @@ function(qt6_add_dbus_interface _sources _interface _basename) endfunction() if(NOT QT_NO_CREATE_VERSIONLESS_FUNCTIONS) - function(qt_add_dbus_interface sources) + macro(qt_add_dbus_interface) if(QT_DEFAULT_MAJOR_VERSION EQUAL 5) - qt5_add_dbus_interface("${sources}" ${ARGN}) + qt5_add_dbus_interface(${ARGV}) elseif(QT_DEFAULT_MAJOR_VERSION EQUAL 6) - qt6_add_dbus_interface("${sources}" ${ARGN}) + qt6_add_dbus_interface(${ARGV}) endif() - set("${sources}" "${${sources}}" PARENT_SCOPE) - endfunction() + endmacro() endif() @@ -100,14 +99,13 @@ function(qt6_add_dbus_interfaces _sources) endfunction() if(NOT QT_NO_CREATE_VERSIONLESS_FUNCTIONS) - function(qt_add_dbus_interfaces sources) + macro(qt_add_dbus_interfaces) if(QT_DEFAULT_MAJOR_VERSION EQUAL 5) - qt5_add_dbus_interfaces("${sources}" ${ARGN}) + qt5_add_dbus_interfaces(${ARGV}) elseif(QT_DEFAULT_MAJOR_VERSION EQUAL 6) - qt6_add_dbus_interfaces("${sources}" ${ARGN}) + qt6_add_dbus_interfaces(${ARGV}) endif() - set("${sources}" "${${sources}}" PARENT_SCOPE) - endfunction() + endmacro() endif() @@ -145,13 +143,13 @@ function(qt6_generate_dbus_interface _header) # _customName OPTIONS -some -optio endfunction() if(NOT QT_NO_CREATE_VERSIONLESS_FUNCTIONS) - function(qt_generate_dbus_interface) + macro(qt_generate_dbus_interface) if(QT_DEFAULT_MAJOR_VERSION EQUAL 5) qt5_generate_dbus_interface(${ARGV}) elseif(QT_DEFAULT_MAJOR_VERSION EQUAL 6) qt6_generate_dbus_interface(${ARGV}) endif() - endfunction() + endmacro() endif() @@ -203,12 +201,11 @@ function(qt6_add_dbus_adaptor _sources _xml_file _include) # _optionalParentClas endfunction() if(NOT QT_NO_CREATE_VERSIONLESS_FUNCTIONS) - function(qt_add_dbus_adaptor sources) + macro(qt_add_dbus_adaptor) if(QT_DEFAULT_MAJOR_VERSION EQUAL 5) - qt5_add_dbus_adaptor("${sources}" ${ARGN}) + qt5_add_dbus_adaptor(${ARGV}) elseif(QT_DEFAULT_MAJOR_VERSION EQUAL 6) - qt6_add_dbus_adaptor("${sources}" ${ARGN}) + qt6_add_dbus_adaptor(${ARGV}) endif() - set("${sources}" "${${sources}}" PARENT_SCOPE) - endfunction() + endmacro() endif() |