diff options
| author | Kai Koehne <kai.koehne@qt.io> | 2020-07-06 19:31:28 +0200 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@qt.io> | 2020-07-08 17:14:11 +0200 |
| commit | 03de9a41da039f79b9a8881e9c8c476b008d4d07 (patch) | |
| tree | e907fe5562b7c20081aaff5b1f5dd1b9f155f15b | |
| parent | 986d89c2eefd37ee0da8e07d7794716000608610 (diff) | |
CMake: Fix dependency in qt_add_big_resources
Ensure that the second rcc pass is executed whenever the
object file changes.
Patch provided by Hongpeng Liu <lhpzwd@163.com>
Fixes: QTBUG-85186
Pick-to: 5.15
Change-Id: I6e52ec15048ab286efd85500ca535b2b8b01c270
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| -rw-r--r-- | src/corelib/Qt5CoreMacros.cmake | 2 | ||||
| -rw-r--r-- | src/corelib/Qt6CoreMacros.cmake | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/Qt5CoreMacros.cmake b/src/corelib/Qt5CoreMacros.cmake index 88350cb68b..c973799140 100644 --- a/src/corelib/Qt5CoreMacros.cmake +++ b/src/corelib/Qt5CoreMacros.cmake @@ -406,7 +406,7 @@ function(qt5_add_big_resources outfiles) add_custom_command(OUTPUT ${outfile} COMMAND ${Qt5Core_RCC_EXECUTABLE} ARGS ${rcc_options} --name ${outfilename} --pass 2 --temp $<TARGET_OBJECTS:rcc_object_${outfilename}> --output ${outfile} ${infile} - DEPENDS rcc_object_${outfilename} + DEPENDS rcc_object_${outfilename} $<TARGET_OBJECTS:rcc_object_${outfilename}> VERBATIM) list(APPEND ${outfiles} ${outfile}) endforeach() diff --git a/src/corelib/Qt6CoreMacros.cmake b/src/corelib/Qt6CoreMacros.cmake index 536928ae60..2d0aff8aff 100644 --- a/src/corelib/Qt6CoreMacros.cmake +++ b/src/corelib/Qt6CoreMacros.cmake @@ -404,7 +404,7 @@ function(qt6_add_big_resources outfiles ) add_custom_command(OUTPUT ${outfile} COMMAND ${QT_CMAKE_EXPORT_NAMESPACE}::rcc ARGS ${rcc_options} --name ${outfilename} --pass 2 --temp $<TARGET_OBJECTS:rcc_object_${outfilename}> --output ${outfile} ${infile} - DEPENDS rcc_object_${outfilename} ${QT_CMAKE_EXPORT_NAMESPACE}::rcc + DEPENDS rcc_object_${outfilename} $<TARGET_OBJECTS:rcc_object_${outfilename}> ${QT_CMAKE_EXPORT_NAMESPACE}::rcc VERBATIM) list(APPEND ${outfiles} ${outfile}) endforeach() |