diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-11-16 18:42:23 +0100 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-11-19 06:28:53 +0100 |
commit | f9dcade5e795a631b9a2d93c855aa8198d58e24e (patch) | |
tree | ebfc36644dbaa7190600f5efeee92c7c8d607765 /cmake/QtFindPackageHelpers.cmake | |
parent | 5533eeeb0110c00a9658d5d3ceba6f882bf9cea1 (diff) |
CMake: Fix resource objects story in static prl files
The CMake build of Qt intends to improve the developer experience in
regards to static Qt builds and Qt resource files. Specifically with a
CMake build of Qt, Qt developers don't have to manually call
Q_INIT_RESOURCE anymore.
For details see the following commits
e343affd6345ef8db041789a96016c3a84830dc9
e817ac3d68295fc0670ccede4df08bf1c7e627d2
4ab54320817ebbb465af343514d21139a654aed3
The last commit's implementation is incomplete though.
To ensure successful linking, each target's prl file should contain
not only the resource object files that are assigned to the target,
but also all resource object files of the target's dependencies.
To achieve that, qt_collect_libs will now recursively collect all
resource object files assigned to the QT_RCC_OBJECTS property of each
dependency.
Note this implementation is still incomplete. We do not export rcc
object file information in the CMake Targets files.
That means that when configuring qtdeclarative in a
non-top-level build, the generated Qml prl file will not
contain references to Core's mimetypes resource object file, etc.
So with the current change, only the object files that are part of the
current CMake configuration build are tracked.
Exporting the resource object files locations proves in a format
usable for prl files proves to be difficult (due to CMake not
supporting exporting genexes in random properties) and will have to be
addressed in a separate change.
Amends 4ab54320817ebbb465af343514d21139a654aed3
Task-number: QTBUG-88425
Change-Id: I546655bdfdf7aa86a8df9aadfc054fa415130a33
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'cmake/QtFindPackageHelpers.cmake')
-rw-r--r-- | cmake/QtFindPackageHelpers.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmake/QtFindPackageHelpers.cmake b/cmake/QtFindPackageHelpers.cmake index 9e2c749abc..f874a6d744 100644 --- a/cmake/QtFindPackageHelpers.cmake +++ b/cmake/QtFindPackageHelpers.cmake @@ -9,7 +9,7 @@ # # Uses qt_internal_walk_libs. function(qt_find_package_promote_targets_to_global_scope target) - qt_internal_walk_libs("${target}" _discared_out_var + qt_internal_walk_libs("${target}" _discarded_out_var _discarded_out_var_2 "qt_find_package_targets_dict" "promote_global") endfunction() |