Skip to content

Commit 9909551

Browse files
committed
Merge branch 'PHP-8.3'
2 parents 4bba094 + 1576473 commit 9909551

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+583
-898
lines changed

cmake/cmake/modules/FindACL.cmake

Lines changed: 14 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,31 @@
11
#[=============================================================================[
22
Find the ACL library.
33
4-
Module defines the following IMPORTED target(s):
4+
Module defines the following `IMPORTED` target(s):
55
6-
ACL::ACL
7-
The package library, if found.
6+
* `ACL::ACL` - The package library, if found.
87
98
Result variables:
109
11-
ACL_FOUND
12-
Whether the package has been found.
13-
ACL_INCLUDE_DIRS
14-
Include directories needed to use this package.
15-
ACL_LIBRARIES
16-
Libraries needed to link to the package library.
17-
ACL_VERSION
18-
Package version, if found.
10+
* `ACL_FOUND` - Whether the package has been found.
11+
* `ACL_INCLUDE_DIRS` - Include directories needed to use this package.
12+
* `ACL_LIBRARIES` - Libraries needed to link to the package library.
13+
* `ACL_VERSION` - Package version, if found.
1914
2015
Cache variables:
2116
22-
ACL_IS_BUILT_IN
23-
Whether ACL is a part of the C library (BSD-based systems).
24-
ACL_INCLUDE_DIR
25-
Directory containing package library headers.
26-
ACL_LIBRARY
27-
The path to the package library.
17+
* `ACL_IS_BUILT_IN` - Whether ACL is a part of the C library (BSD-based
18+
systems).
19+
* `ACL_INCLUDE_DIR` - Directory containing package library headers.
20+
* `ACL_LIBRARY` - The path to the package library.
2821
2922
Hints:
3023
31-
The ACL_ROOT variable adds custom search path.
24+
The `ACL_ROOT` variable adds custom search path.
3225
33-
Set ACL_USE_USER_GROUP to TRUE before calling find_package(ACL) to also check
34-
if the ACL library supports ACL_USER and ACL_GROUP. For example, macOS doesn't
35-
have support for user/group.
26+
Set `ACL_USE_USER_GROUP` to `TRUE` before calling `find_package(ACL)` to also
27+
check if the ACL library supports `ACL_USER` and `ACL_GROUP`. For example, macOS
28+
doesn't have support for user/group.
3629
#]=============================================================================]
3730

3831
include(CheckSourceCompiles)

cmake/cmake/modules/FindApache.cmake

Lines changed: 26 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,43 @@
11
#[=============================================================================[
22
Find the Apache packages and tools.
33
4-
The Apache development package usually contains Apache header files, the apr
5-
(Apache Portable Runtime) library and its headers, apr config command-line tool,
6-
and the apxs command-line tool.
4+
The Apache development package usually contains Apache header files, the `apr`
5+
(Apache Portable Runtime) library and its headers, `apr` config command-line
6+
tool, and the `apxs` command-line tool.
77
8-
Module defines the following IMPORTED target(s):
8+
Module defines the following `IMPORTED` target(s):
99
10-
Apache::Apache
11-
The package library, if found.
10+
* `Apache::Apache` - The package library, if found.
1211
1312
Result variables:
1413
15-
Apache_FOUND
16-
Whether the package has been found.
17-
Apache_INCLUDE_DIRS
18-
Include directories needed to use this package.
19-
Apache_LIBRARIES
20-
Libraries needed to link to the package library.
21-
Apache_VERSION
22-
Package version, if found.
23-
Apache_THREADED
24-
Whether Apache requires thread safety.
25-
Apache_LIBEXECDIR
26-
Path to the directory containing all Apache modules and httpd.exp file (list
27-
of exported symbols).
14+
* `Apache_FOUND` - Whether the package has been found.
15+
* `Apache_INCLUDE_DIRS` - Include directories needed to use this package.
16+
* `Apache_LIBRARIES` - Libraries needed to link to the package library.
17+
* `Apache_VERSION` - Package version, if found.
18+
* `Apache_THREADED` - Whether Apache requires thread safety.
19+
* `Apache_LIBEXECDIR` - Path to the directory containing all Apache modules and
20+
`httpd.exp` file (list of exported symbols).
2821
2922
Cache variables:
3023
31-
Apache_APXS_EXECUTABLE
32-
Path to the APache eXtenSion tool command-line tool.
33-
Apache_APXS_DEFINITIONS
34-
A list of compile definitions (-D) from the apxs CFLAGS query string.
35-
Apache_APR_CONFIG_EXECUTABLE
36-
Path to the apr library command-line configuration tool.
37-
Apache_APR_CPPFLAGS
38-
A list of C preprocessor flags for the APR library.
39-
Apache_APU_CONFIG_EXECUTABLE
40-
Path to the Apache Portable Runtime Utilities config command-line tool.
41-
Apache_EXECUTABLE
42-
Path to the Apache command-line server program.
43-
Apache_INCLUDE_DIR
44-
Directory containing package library headers.
45-
Apache_APR_INCLUDE_DIR
46-
Directory containing apr library headers.
47-
Apache_APR_LIBRARY
48-
The path to the apr library.
24+
* `Apache_APXS_EXECUTABLE` - Path to the APache eXtenSion tool command-line tool
25+
(`apxs`).
26+
* `Apache_APXS_DEFINITIONS` - A list of compile definitions (`-D`) from the
27+
`apxs -q CFLAGS` query string.
28+
* `Apache_APR_CONFIG_EXECUTABLE` - Path to the `apr` library command-line
29+
configuration tool.
30+
* `Apache_APR_CPPFLAGS` - A list of C preprocessor flags for the `apr` library.
31+
* `Apache_APU_CONFIG_EXECUTABLE` - Path to the Apache Portable Runtime Utilities
32+
config command-line tool.
33+
* `Apache_EXECUTABLE` - Path to the Apache command-line server program.
34+
* `Apache_INCLUDE_DIR` - Directory containing package library headers.
35+
* `Apache_APR_INCLUDE_DIR` - Directory containing `apr` library headers.
36+
* `Apache_APR_LIBRARY` - The path to the `apr` library.
4937
5038
Hints:
5139
52-
The Apache_ROOT variable adds custom search path.
40+
The `Apache_ROOT` variable adds custom search path.
5341
#]=============================================================================]
5442

5543
include(FeatureSummary)

cmake/cmake/modules/FindAppArmor.cmake

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,25 @@
11
#[=============================================================================[
22
Find the AppArmor library.
33
4-
Module defines the following IMPORTED target(s):
4+
Module defines the following `IMPORTED` target(s):
55
6-
AppArmor::AppArmor
7-
The package library, if found.
6+
* `AppArmor::AppArmor` - The package library, if found.
87
98
Result variables:
109
11-
AppArmor_FOUND
12-
Whether the package has been found.
13-
AppArmor_INCLUDE_DIRS
14-
Include directories needed to use this package.
15-
AppArmor_LIBRARIES
16-
Libraries needed to link to the package library.
17-
AppArmor_VERSION
18-
Package version, if found.
10+
* `AppArmor_FOUND` - Whether the package has been found.
11+
* `AppArmor_INCLUDE_DIRS` - Include directories needed to use this package.
12+
* `AppArmor_LIBRARIES` - Libraries needed to link to the package library.
13+
* `AppArmor_VERSION` - Package version, if found.
1914
2015
Cache variables:
2116
22-
AppArmor_INCLUDE_DIR
23-
Directory containing package library headers.
24-
AppArmor_LIBRARY
25-
The path to the package library.
17+
* `AppArmor_INCLUDE_DIR` - Directory containing package library headers.
18+
* `AppArmor_LIBRARY` - The path to the package library.
2619
2720
Hints:
2821
29-
The AppArmor_ROOT variable adds custom search path.
22+
The `AppArmor_ROOT` variable adds custom search path.
3023
#]=============================================================================]
3124

3225
include(CheckLibraryExists)

cmake/cmake/modules/FindArgon2.cmake

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,25 @@
11
#[=============================================================================[
22
Find the Argon2 library.
33
4-
Module defines the following IMPORTED target(s):
4+
Module defines the following `IMPORTED` target(s):
55
6-
Argon2::Argon2
7-
The package library, if found.
6+
* `Argon2::Argon2` - The package library, if found.
87
98
Result variables:
109
11-
Argon2_FOUND
12-
Whether the package has been found.
13-
Argon2_INCLUDE_DIRS
14-
Include directories needed to use this package.
15-
Argon2_LIBRARIES
16-
Libraries needed to link to the package library.
17-
Argon2_VERSION
18-
Package version, if found.
10+
* `Argon2_FOUND` - Whether the package has been found.
11+
* `Argon2_INCLUDE_DIRS` - Include directories needed to use this package.
12+
* `Argon2_LIBRARIES` - Libraries needed to link to the package library.
13+
* `Argon2_VERSION` - Package version, if found.
1914
2015
Cache variables:
2116
22-
Argon2_INCLUDE_DIR
23-
Directory containing package library headers.
24-
Argon2_LIBRARY
25-
The path to the package library.
17+
* `Argon2_INCLUDE_DIR` - Directory containing package library headers.
18+
* `Argon2_LIBRARY` - The path to the package library.
2619
2720
Hints:
2821
29-
The Argon2_ROOT variable adds custom search path.
22+
The `Argon2_ROOT` variable adds custom search path.
3023
#]=============================================================================]
3124

3225
include(FeatureSummary)

cmake/cmake/modules/FindAtomic.cmake

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
11
#[=============================================================================[
22
Find the atomic instructions.
33
4-
Module defines the following IMPORTED target(s):
4+
Module defines the following `IMPORTED` target(s):
55
6-
Atomic::Atomic
7-
The Atomic library, if found.
6+
* `Atomic::Atomic` - The Atomic library, if found.
87
98
Result variables:
109
11-
Atomic_FOUND
12-
Whether atomic instructions are available.
13-
Atomic_LIBRARIES
14-
A list of libraries needed in order to use atomic functionality.
10+
* `Atomic_FOUND` - Whether atomic instructions are available.
11+
* `Atomic_LIBRARIES` - A list of libraries needed in order to use atomic
12+
functionality.
1513
#]=============================================================================]
1614

1715
include(CheckSourceCompiles)

cmake/cmake/modules/FindBerkeleyDB.cmake

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,32 @@
11
#[=============================================================================[
22
Find the Berkeley DB library.
33
4-
Module defines the following IMPORTED target(s):
4+
Module defines the following `IMPORTED` target(s):
55
6-
BerkeleyDB::BerkeleyDB
7-
The package library, if found.
6+
* `BerkeleyDB::BerkeleyDB` - The package library, if found.
87
98
Result variables:
109
11-
BerkeleyDB_FOUND
10+
`BerkeleyDB_FOUND`
1211
Whether the package has been found.
13-
BerkeleyDB_INCLUDE_DIRS
12+
`BerkeleyDB_INCLUDE_DIRS`
1413
Include directories needed to use this package.
15-
BerkeleyDB_LIBRARIES
14+
`BerkeleyDB_LIBRARIES`
1615
Libraries needed to link to the package library.
1716
1817
Cache variables:
1918
20-
BerkeleyDB_INCLUDE_DIR
21-
Directory containing package library headers.
22-
BerkeleyDB_LIBRARY
23-
The path to the package library.
24-
BerkeleyDB_DB1_INCLUDE_DIR
25-
Directory containing headers for DB1 emulation support in Berkeley DB.
19+
* `BerkeleyDB_INCLUDE_DIR` - Directory containing package library headers.
20+
* `BerkeleyDB_LIBRARY` - The path to the package library.
21+
* `BerkeleyDB_DB1_INCLUDE_DIR` - Directory containing headers for DB1 emulation
22+
support in Berkeley DB.
2623
2724
Hints:
2825
29-
The BerkeleyDB_ROOT variable adds custom search path.
26+
The `BerkeleyDB_ROOT` variable adds custom search path.
3027
31-
Set BerkeleyDB_USE_DB1 to TRUE before calling find_package(BerkeleyDB) to
32-
enable the Berkeley DB 1.x support/emulation.
28+
Set `BerkeleyDB_USE_DB1` to `TRUE` before calling `find_package(BerkeleyDB)` to
29+
enable the Berkeley DB 1.x support/emulation.
3330
#]=============================================================================]
3431

3532
include(CheckSourceCompiles)

cmake/cmake/modules/FindCapstone.cmake

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,25 @@
11
#[=============================================================================[
22
Find the Capstone library.
33
4-
Module defines the following IMPORTED target(s):
4+
Module defines the following `IMPORTED` target(s):
55
6-
Capstone::Capstone
7-
The package library, if found.
6+
* `Capstone::Capstone` - The package library, if found.
87
98
Result variables:
109
11-
Capstone_FOUND
12-
Whether the package has been found.
13-
Capstone_INCLUDE_DIRS
14-
Include directories needed to use this package.
15-
Capstone_LIBRARIES
16-
Libraries needed to link to the package library.
17-
Capstone_VERSION
18-
Package version, if found.
10+
* `Capstone_FOUND` - Whether the package has been found.
11+
* `Capstone_INCLUDE_DIRS` - Include directories needed to use this package.
12+
* `Capstone_LIBRARIES` - Libraries needed to link to the package library.
13+
* `Capstone_VERSION` - Package version, if found.
1914
2015
Cache variables:
2116
22-
Capstone_INCLUDE_DIR
23-
Directory containing package library headers.
24-
Capstone_LIBRARY
25-
The path to the package library.
17+
* `Capstone_INCLUDE_DIR` - Directory containing package library headers.
18+
* `Capstone_LIBRARY` - The path to the package library.
2619
2720
Hints:
2821
29-
The Capstone_ROOT variable adds custom search path.
22+
The `Capstone_ROOT` variable adds custom search path.
3023
#]=============================================================================]
3124

3225
include(FeatureSummary)

cmake/cmake/modules/FindCcache.cmake

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,19 @@ Find the Ccache compiler cache tool for faster compilation times.
33
44
Result variables:
55
6-
Ccache_FOUND
7-
Whether the package has been found.
8-
Ccache_VERSION
9-
Package version, if found.
6+
* `Ccache_FOUND` - Whether the package has been found.
7+
* `Ccache_VERSION` - Package version, if found.
108
119
Cache variables:
1210
13-
Ccache_EXECUTABLE
14-
The path to the ccache executable.
11+
* `Ccache_EXECUTABLE` - The path to the ccache executable.
1512
1613
Hints:
1714
18-
The Ccache_ROOT variable adds custom search path.
15+
The `Ccache_ROOT` variable adds custom search path.
1916
20-
CCACHE_DISABLE environment variable disables the ccache and doesn't add it to
21-
C and CXX launcher, see Ccache documentation for more info.
17+
The `CCACHE_DISABLE` environment variable disables the ccache and doesn't add it
18+
to the C and CXX launcher, see Ccache documentation for more info.
2219
#]=============================================================================]
2320

2421
include(FeatureSummary)

0 commit comments

Comments
 (0)