diff options
| author |   Alexandru Croitor <alexandru.croitor@qt.io> | 2024-05-10 17:46:49 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2024-05-10 22:17:19 +0200 |
| commit | aec74f9c767b979dbe488f48e311fe4d04413edc (patch) | |
| tree | 64a298e54e54e75d24c2b6d695cb50749c2332b2 | |
| parent | QMetaType: use modern comparisons (diff) | |
| download | qtbase-aec74f9c767b979dbe488f48e311fe4d04413edc.tar.xz qtbase-aec74f9c767b979dbe488f48e311fe4d04413edc.zip | |
CMake: Propagate ZLIB version in Find script to wrapper script
Pick-to: 6.5 6.7
Change-Id: Ieba03d792b5a21c7a101e3034831475d22fd9814
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
| -rw-r--r-- | cmake/FindWrapSystemZLIB.cmake | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/cmake/FindWrapSystemZLIB.cmake b/cmake/FindWrapSystemZLIB.cmake index 5db43db626..f9a8f004ec 100644 --- a/cmake/FindWrapSystemZLIB.cmake +++ b/cmake/FindWrapSystemZLIB.cmake @@ -28,5 +28,13 @@ if(ZLIB_FOUND) endif() endif() +if(ZLIB_VERSION) + set(WrapSystemZLIB_VERSION "${ZLIB_VERSION}") +elseif(ZLIB_VERSION_STRING) + set(WrapSystemZLIB_VERSION "${ZLIB_VERSION_STRING}") +endif() + 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) |