Skip to content

Commit c47e724

Browse files
committed
Merge branch 'PHP-8.4'
2 parents 6d41848 + c8f8d1a commit c47e724

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

cmake/ext/bz2/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ if(TARGET BZip2::BZip2)
9191
# updated in the bzlib.h header. BZ2_bzerror() is available as of 1.0.0.
9292
block()
9393
set(headers "bzlib.h")
94-
if(BZip2_VERSION VERSION_LESS 1.0.4)
94+
if(BZIP2_VERSION VERSION_LESS 1.0.4)
9595
list(PREPEND headers "stdio.h")
9696
endif()
9797
check_symbol_exists(BZ2_bzerror "${headers}" PHP_EXT_BZ2_SANITY_CHECK)

docs/cmake/cmake.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -287,6 +287,8 @@ version available on the operating system.
287287
* `$<LIST:FILTER,list,...>` generator expression
288288
* `$<LIST:SORT,list[,...]>` generator expression
289289
* `<PACKAGENAME>_ROOT` variables in addition to `<PackageName>_ROOT`
290+
* 3.26
291+
* `BZIP2_VERSION`
290292
* 3.29
291293
* `CMAKE_LINKER_TYPE`
292294
* `if(IS_EXECUTABLE)`

0 commit comments

Comments
 (0)