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

CMake: Propagate ZLIB version in Find script to wrapper script

Browse Source 
Pick-to: 6.5
Change-Id: Ieba03d792b5a21c7a101e3034831475d22fd9814
Reviewed-by:  Alexey Edelev <alexey.edelev@qt.io>
(cherry picked from commit aec74f9c767b979dbe488f48e311fe4d04413edc)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Alexandru Croitor 2024-05-10 17:46:49 +02:00 committed by Qt Cherry-pick Bot
parent 4a5d814d33
commit dacab83373
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cmake/FindWrapSystemZLIB.cmake
View File

@ -28,5 +28,13 @@ if(ZLIB_FOUND)
endif() endif()
endif() endif()
if(ZLIB_VERSION)
set(WrapSystemZLIB_VERSION "${ZLIB_VERSION}")
elseif(ZLIB_VERSION_STRING)
set(WrapSystemZLIB_VERSION "${ZLIB_VERSION_STRING}")
endif()
include(FindPackageHandleStandardArgs) include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(WrapSystemZLIB DEFAULT_MSG WrapSystemZLIB_FOUND) find_package_handle_standard_args(WrapSystemZLIB
REQUIRED_VARS WrapSystemZLIB_FOUND
VERSION_VAR WrapSystemZLIB_VERSION)