From 3e36d8144ec185d7f57d75c9885cf5633c1d3f28 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Thu, 30 Jun 2022 17:11:27 +0200 Subject: [PATCH] CMake: Fix confusing FPHSA zstd version warning message MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Previously if zstd was not found, one would see such a warning message Could NOT find WrapZSTD: Found unsuitable version "", but required is at least "1.3" (found ZSTD_LIBRARY-NOTFOUND) This is because PC_ZSTD_VERSION was a defined variable with an empty value, which makes FPHSA believe that a version was extracted from somewhere. Avoid passing that value directly. Now the warning message is Could NOT find WrapZSTD (missing: ZSTD_LIBRARIES ZSTD_INCLUDE_DIRS) (Required is at least version "1.3") Change-Id: I88760d94db0d869d328085996298f4aaa88bc6c2 Reviewed-by: Qt CI Bot Reviewed-by: Jörg Bornemann Reviewed-by: Alexey Edelev (cherry picked from commit d59628881e0b35d10fa4cf7ba7b892b07cc18106) Reviewed-by: Qt Cherry-pick Bot --- cmake/FindWrapZSTD.cmake | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cmake/FindWrapZSTD.cmake b/cmake/FindWrapZSTD.cmake index e619d78c865..d088e94cc7d 100644 --- a/cmake/FindWrapZSTD.cmake +++ b/cmake/FindWrapZSTD.cmake @@ -56,9 +56,12 @@ else() include(SelectLibraryConfigurations) select_library_configurations(ZSTD) + if(PC_ZSTD_VERSION) + set(WrapZSTD_VERSION "${PC_ZSTD_VERSION}") + endif() find_package_handle_standard_args(WrapZSTD REQUIRED_VARS ZSTD_LIBRARIES ZSTD_INCLUDE_DIRS - VERSION_VAR PC_ZSTD_VERSION) + VERSION_VAR WrapZSTD_VERSION) if(WrapZSTD_FOUND AND NOT TARGET WrapZSTD::WrapZSTD) add_library(WrapZSTD::WrapZSTD UNKNOWN IMPORTED)