diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-02-10 18:31:58 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-02-10 18:35:07 +0100 |
| commit | 3af9d49bb78ac56bff57d1c3867853730f97a8e1 (patch) | |
| tree | c9d6c1d1fe90dba3c788fd06795cf05a6d4ed5bb /src/dbus | |
| parent | 71436d5499a9e0355f778f47ef465486a727049d (diff) | |
| parent | c431e2d33c2b13dee8b43a08c267c20ec1ae9654 (diff) | |
Merge remote-tracking branch 'origin/wip/cmake' into dev
Change-Id: If75ae006db6eb977cf66af4c3d36cb5c8098a1f1
Diffstat (limited to 'src/dbus')
| -rw-r--r-- | src/dbus/.prev_CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/dbus/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/dbus/Qt6DBusMacros.cmake | 13 |
3 files changed, 13 insertions, 4 deletions
diff --git a/src/dbus/.prev_CMakeLists.txt b/src/dbus/.prev_CMakeLists.txt index 45e1e11a25..1136ebe19b 100644 --- a/src/dbus/.prev_CMakeLists.txt +++ b/src/dbus/.prev_CMakeLists.txt @@ -46,6 +46,8 @@ qt_add_module(DBus Qt::CorePrivate PUBLIC_LIBRARIES Qt::Core + PRIVATE_MODULE_INTERFACE + Qt::CorePrivate ) #### Keys ignored in scope 1:.:.:dbus.pro:<TRUE>: diff --git a/src/dbus/CMakeLists.txt b/src/dbus/CMakeLists.txt index d6b6d95798..ea1d7abaa1 100644 --- a/src/dbus/CMakeLists.txt +++ b/src/dbus/CMakeLists.txt @@ -46,6 +46,8 @@ qt_add_module(DBus Qt::CorePrivate PUBLIC_LIBRARIES Qt::Core + PRIVATE_MODULE_INTERFACE + Qt::CorePrivate ) set_source_files_properties(qdbusmarshaller.cpp diff --git a/src/dbus/Qt6DBusMacros.cmake b/src/dbus/Qt6DBusMacros.cmake index 85de817a0b..d7bba30148 100644 --- a/src/dbus/Qt6DBusMacros.cmake +++ b/src/dbus/Qt6DBusMacros.cmake @@ -59,7 +59,9 @@ function(qt6_add_dbus_interface _sources _interface _basename) add_custom_command(OUTPUT "${_impl}" "${_header}" COMMAND ${QT_CMAKE_EXPORT_NAMESPACE}::qdbusxml2cpp ${_params} -p ${_basename} ${_infile} - DEPENDS ${_infile} VERBATIM) + DEPENDS ${_infile} ${QT_CMAKE_EXPORT_NAMESPACE}::qdbuscpp2xml + VERBATIM + ) set_source_files_properties("${_impl}" "${_header}" PROPERTIES SKIP_AUTOMOC TRUE) @@ -134,7 +136,8 @@ function(qt6_generate_dbus_interface _header) # _customName OPTIONS -some -optio add_custom_command(OUTPUT ${_target} COMMAND ${QT_CMAKE_EXPORT_NAMESPACE}::qdbuscpp2xml ${_DBUS_INTERFACE_OPTIONS} ${_in_file} -o ${_target} - DEPENDS ${_in_file} VERBATIM + DEPENDS ${_in_file} ${QT_CMAKE_EXPORT_NAMESPACE}::qdbuscpp2xml + VERBATIM ) endfunction() @@ -168,12 +171,14 @@ function(qt6_add_dbus_adaptor _sources _xml_file _include _parentClass) # _optio if(_optionalClassName) add_custom_command(OUTPUT "${_impl}" "${_header}" COMMAND ${QT_CMAKE_EXPORT_NAMESPACE}::qdbusxml2cpp -m -a ${_basename} -c ${_optionalClassName} -i ${_include} -l ${_parentClass} ${_infile} - DEPENDS ${_infile} VERBATIM + DEPENDS ${_infile} ${QT_CMAKE_EXPORT_NAMESPACE}::qdbuscpp2xml + VERBATIM ) else() add_custom_command(OUTPUT "${_impl}" "${_header}" COMMAND ${QT_CMAKE_EXPORT_NAMESPACE}::qdbusxml2cpp -m -a ${_basename} -i ${_include} -l ${_parentClass} ${_infile} - DEPENDS ${_infile} VERBATIM + DEPENDS ${_infile} ${QT_CMAKE_EXPORT_NAMESPACE}::qdbuscpp2xml + VERBATIM ) endif() |