]>
Commit | Line | Data |
---|---|---|
c5ca293a JB |
1 | --- cmake-3.27.3/Modules/FindZLIB.cmake.orig 2023-08-16 19:46:35.000000000 +0200 |
2 | +++ cmake-3.27.3/Modules/FindZLIB.cmake 2023-08-23 16:25:36.123237881 +0200 | |
3 | @@ -179,9 +179,15 @@ if(ZLIB_INCLUDE_DIR AND EXISTS "${ZLIB_I | |
4 | ||
5 | string(REGEX REPLACE "^.*ZLIB_VERSION \"([0-9]+).*$" "\\1" ZLIB_VERSION_MAJOR "${ZLIB_H}") | |
6 | string(REGEX REPLACE "^.*ZLIB_VERSION \"[0-9]+\\.([0-9]+).*$" "\\1" ZLIB_VERSION_MINOR "${ZLIB_H}") | |
7 | - string(REGEX REPLACE "^.*ZLIB_VERSION \"[0-9]+\\.[0-9]+\\.([0-9]+).*$" "\\1" ZLIB_VERSION_PATCH "${ZLIB_H}") | |
8 | - set(ZLIB_VERSION_STRING "${ZLIB_VERSION_MAJOR}.${ZLIB_VERSION_MINOR}.${ZLIB_VERSION_PATCH}") | |
9 | + set(ZLIB_VERSION_STRING "${ZLIB_VERSION_MAJOR}.${ZLIB_VERSION_MINOR}") | |
10 | ||
11 | + # only append a PATCH version if it exists: | |
12 | + set(ZLIB_VERSION_PATCH "") | |
13 | + if( "${ZLIB_H}" MATCHES "ZLIB_VERSION \"[0-9]+\\.[0-9]+\\.([0-9]+)") | |
14 | + set(ZLIB_VERSION_PATCH "${CMAKE_MATCH_1}") | |
15 | + string(APPEND ZLIB_VERSION_STRING ".${ZLIB_VERSION_PATCH}") | |
16 | + endif() | |
17 | + | |
18 | # only append a TWEAK version if it exists: | |
19 | set(ZLIB_VERSION_TWEAK "") | |
20 | if( "${ZLIB_H}" MATCHES "ZLIB_VERSION \"[0-9]+\\.[0-9]+\\.[0-9]+\\.([0-9]+)") |