AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CMake: Fix confusing FPHSA zstd version warning message

Browse Source 
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")

Pick-to: 6.2 6.3 6.4
Change-Id: I88760d94db0d869d328085996298f4aaa88bc6c2
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
This commit is contained in:
Alexandru Croitor 2022-06-30 17:11:27 +02:00
parent a310319a04
commit d59628881e
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmake/FindWrapZSTD.cmake
View File

@ -56,9 +56,12 @@ else()
include(SelectLibraryConfigurations) include(SelectLibraryConfigurations)
select_library_configurations(ZSTD) select_library_configurations(ZSTD)
if(PC_ZSTD_VERSION)
set(WrapZSTD_VERSION "${PC_ZSTD_VERSION}")
endif()
find_package_handle_standard_args(WrapZSTD find_package_handle_standard_args(WrapZSTD
REQUIRED_VARS ZSTD_LIBRARIES ZSTD_INCLUDE_DIRS REQUIRED_VARS ZSTD_LIBRARIES ZSTD_INCLUDE_DIRS
VERSION_VAR PC_ZSTD_VERSION) VERSION_VAR WrapZSTD_VERSION)
if(WrapZSTD_FOUND AND NOT TARGET WrapZSTD::WrapZSTD) if(WrapZSTD_FOUND AND NOT TARGET WrapZSTD::WrapZSTD)
add_library(WrapZSTD::WrapZSTD UNKNOWN IMPORTED) add_library(WrapZSTD::WrapZSTD UNKNOWN IMPORTED)