qt/qttools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ensure that FindWrapLibClang doesn't propagate zstd

Browse Source 
Avoid propagating zstd targets of any kind to global.

Fixes: QTBUG-119469
Change-Id: Ib1aa0accc9e6d38e9135a82cd9492f00ec65b2ad
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Alexey Edelev
2024-05-27 11:33:04 +02:00
parent b22644dd73
commit f57d15654b
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/FindWrapLibClang.cmake
+6
View File
@@ -17,9 +17,15 @@ endif()
find_package(Clang CONFIG)
# LLVM versions >= 16 come with Findzstd.cmake that creates a target for libzstd.
# Disable its global promotion to prevent interference with FindWrapZSTD.cmake.
if(TARGET zstd::libzstd)
qt_internal_disable_find_package_global_promotion(zstd::libzstd)
endif()
if(TARGET zstd::libzstd_shared)
qt_internal_disable_find_package_global_promotion(zstd::libzstd_shared)
endif()
if(TARGET zstd::libzstd_static)
qt_internal_disable_find_package_global_promotion(zstd::libzstd_static)
endif()
if(__qt_wrap_clang_backup_prefix)
set(CMAKE_PREFIX_PATH "${__qt_wrap_clang_backup_prefix}")