diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-06-16 10:39:01 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-06-16 17:56:35 +0200 |
| commit | 4ab54320817ebbb465af343514d21139a654aed3 (patch) | |
| tree | abcbe92ab74281363c563d90f8e25b3a66a30d5f /src/corelib/Qt6CoreMacros.cmake | |
| parent | bd2a14ff9897b8bda0e9bd21f8472b1a5a7dd6f6 (diff) | |
CMake: Write object libs of Qt resources to .prl files
Since commit e343affd634 we're creating object libraries for Qt
resources in static libraries. Those must be reflected in the
generated .prl files for static builds of Qt.
In qt_add_resource, we now calculate the install locations of the
object files of rcc-generated C++ files and save them in the target
property QT_RCC_OBJECTS. This property is then passed to
QtFinishPrlFile to write the object file paths to the .prl file.
Change-Id: Ic383892d723d02fc91f712bc2dbcbc90babad074
Reviewed-by: Simon Hausmann <hausmann@gmail.com>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/corelib/Qt6CoreMacros.cmake')
| -rw-r--r-- | src/corelib/Qt6CoreMacros.cmake | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/corelib/Qt6CoreMacros.cmake b/src/corelib/Qt6CoreMacros.cmake index f740fbe921..856740af3f 100644 --- a/src/corelib/Qt6CoreMacros.cmake +++ b/src/corelib/Qt6CoreMacros.cmake @@ -1042,6 +1042,7 @@ function(__qt_propagate_generated_resource target resource_name generated_source if(type STREQUAL STATIC_LIBRARY) set(resource_target "${target}_resources_${resourceName}") add_library("${resource_target}" OBJECT "${generated_source_code}") + set_property(TARGET ${resource_target} APPEND PROPERTY QT_RESOURCE_NAME ${resourceName}) # Use TARGET_NAME genex to map to the correct prefixed target name when it is exported # via qt_install(EXPORT), so that the consumers of the target can find the object library |