diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2022-07-07 15:15:57 +0000 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2022-07-08 07:38:24 +0000 |
| commit | d56f80fd9afd31d9458da87c64a41b15a67ba3cc (patch) | |
| tree | d653b31a50e085b8d45522ff648b69288ec95dbc /src/tools | |
| parent | e1f25b1c8df04fbbc13af1e2e8ecc1def1cfb3dc (diff) | |
rcc: fix build when cross-compiling
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
Pick-to: 6.4 6.3 6.2
Change-Id: I23987ae0903759cf4f3fd17059c71c8815b8d908
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/rcc/CMakeLists.txt | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/tools/rcc/CMakeLists.txt b/src/tools/rcc/CMakeLists.txt index 8a8a1fa18e..2150a74d84 100644 --- a/src/tools/rcc/CMakeLists.txt +++ b/src/tools/rcc/CMakeLists.txt @@ -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 -) |