1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rcc: fix build when cross-compiling

Browse Source 
The zstd feature is now public, which enabled it in rcc even when rcc
was cross-compiled, but rcc was not linked agaist zstd library.
There is no need to test for cross-compilation anymore or to add
the extra define.

Amends eda4919f252c53f313441afbedb4d0f98e94c9a

Change-Id: I23987ae0903759cf4f3fd17059c71c8815b8d908
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit d56f80fd9afd31d9458da87c64a41b15a67ba3cc)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Samuli Piippo 2022-07-07 15:15:57 +00:00 committed by Qt Cherry-pick Bot
parent 591d8b4cc0
commit cde97bb6aa
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/tools/rcc/CMakeLists.txt
View File

@ -28,14 +28,7 @@ qt_internal_return_unless_building_tools()
## Scopes:
#####################################################################
qt_internal_extend_target(${target_name} CONDITION QT_FEATURE_zstd AND NOT CMAKE_CROSSCOMPILING
DEFINES
QT_FEATURE_zstd=1
qt_internal_extend_target(${target_name} CONDITION QT_FEATURE_zstd
LIBRARIES
WrapZSTD::WrapZSTD
)
qt_internal_extend_target(${target_name} CONDITION CMAKE_CROSSCOMPILING OR NOT QT_FEATURE_zstd
DEFINES
QT_FEATURE_zstd=-1
)