diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2023-12-13 15:19:45 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2024-01-17 13:12:30 +0100 |
| commit | 8c74e8d615a6f060bbf9f3659eeac9399f1bdeb6 (patch) | |
| tree | 047605421ab1a2c5892fb4987358d13c343c8406 | |
| parent | 84053e932feb2605d32da3a12e60de2d46a0b47d (diff) | |
CMake: Add tool wrapper to the dumpcpp call in qt6_target_typelibs
This is required for building Qt with examples or tests that use
qt6_target_typelibs. Otherwise, dumpcpp.exe could not be executed due to
Qt DLLs not being found.
Note that we currently don't have an example or test that uses
qt6_target_typelibs.
Pick-to: 6.6 6.7
Task-number: QTBUG-107663
Change-Id: Id6bb1bd427d94b25cec0bad4a39daa6079dbc9c7
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
| -rw-r--r-- | src/activeqt/container/Qt6AxContainerMacros.cmake | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/activeqt/container/Qt6AxContainerMacros.cmake b/src/activeqt/container/Qt6AxContainerMacros.cmake index e319b90..4d3bd7e 100644 --- a/src/activeqt/container/Qt6AxContainerMacros.cmake +++ b/src/activeqt/container/Qt6AxContainerMacros.cmake @@ -80,8 +80,11 @@ C indentifier") set(out_source "${out_filebasepath}.cpp") list(APPEND out_sources "${out_header}" "${out_source}") + _qt_internal_get_tool_wrapper_script_path(tool_wrapper) + set(dumpcpp_bin "${tool_wrapper}" "$<TARGET_FILE:${QT_CMAKE_EXPORT_NAMESPACE}::dumpcpp>") + add_custom_command(OUTPUT "${out_header}" "${out_source}" - COMMAND ${QT_CMAKE_EXPORT_NAMESPACE}::dumpcpp + COMMAND ${dumpcpp_bin} "${libpath}" -o "${out_filebasepath}" ${extra_args} DEPENDS ${QT_CMAKE_EXPORT_NAMESPACE}::dumpcpp |