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