diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2020-11-26 17:13:49 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2020-12-03 22:28:14 +0000 |
| commit | c52d3fe32eb01c782624edc3d165a17dcb974ee9 (patch) | |
| tree | 3aabe25f10f427e81619d7a2f55a0f971575db12 /src/corelib/Qt6CoreMacros.cmake | |
| parent | fae0903fe9e536aa639d4c9d0d9801448a0b88ed (diff) | |
CMake: Improve long paths handling for static builds
Use number-based naming of object libraries produced for generated
resources. This reduces path length of subdirectories for object
library targets.
Amends 08eb485a006dc2baca42eb280ae60e9f0fc00dff
Change-Id: I1a449290e8a9b969601a1cc1abc6fdcfc0cd9454
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit af0a9375f3af98573291e78511582bb02a9d4491)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/corelib/Qt6CoreMacros.cmake')
| -rw-r--r-- | src/corelib/Qt6CoreMacros.cmake | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/corelib/Qt6CoreMacros.cmake b/src/corelib/Qt6CoreMacros.cmake index bb1deffd04..8c5fce8b80 100644 --- a/src/corelib/Qt6CoreMacros.cmake +++ b/src/corelib/Qt6CoreMacros.cmake @@ -1060,7 +1060,14 @@ endfunction() function(__qt_propagate_generated_resource target resource_name generated_source_code output_generated_target) get_target_property(type ${target} TYPE) if(type STREQUAL STATIC_LIBRARY) - set(resource_target "${target}_resources_${resource_name}") + get_target_property(resource_count ${target} _qt_generated_resource_target_count) + if(NOT resource_count) + set(resource_count "0") + endif() + math(EXPR resource_count "${resource_count} + 1") + set_target_properties(${target} PROPERTIES _qt_generated_resource_target_count ${resource_count}) + + set(resource_target "${target}_resources_${resource_count}") add_library("${resource_target}" OBJECT "${generated_source_code}") set_property(TARGET ${resource_target} APPEND PROPERTY _qt_resource_name ${resource_name}) |