Merge branch 'PHP-8.4'

Author: petk

CMakeLists.txt

@@ -10,7 +10,7 @@ wrapper to bridge the upstream PHP source code with the CMake-based build system
 in this repository located at the cmake directory, streamlining the integration
 process.
 
-Basic usage:
+Usage:
 
   cmake -B <build-dir> [<options>...]
 

bin/make-docs.php

@@ -62,29 +62,12 @@ function generateModuleDocs(
     $markdown .= "* Source code: [$relativeFilename]($url)\n\n";
     $markdown .= $content . "\n";
 
-    if ($namespace) {
-        $footer = <<<EOT
-            ## Basic usage
-
-            ```cmake
-            # CMakeLists.txt
-            include({$namespace}{$moduleName})
-            ```
-            EOT;
-    } elseif (1 === preg_match('/^Find(.+)$/', $moduleName, $matches)) {
+    if (1 === preg_match('/^Find(.+)$/', $moduleName, $matches)) {
         $findPackageName = $matches[1] ?? null;
         $findPackageUpper = strtoupper($findPackageName);
 
-        $footer = <<<EOT
-            ## Basic usage
+        $markdown .= <<<EOT
 
-            ```cmake
-            # CMakeLists.txt
-            find_package($findPackageName)
-            ```
-            EOT;
-
-        $footer_2 = <<<EOT
             ## Customizing search locations
 
             To customize where to look for the $findPackageName package base
@@ -102,26 +85,10 @@ function generateModuleDocs(
                   -D{$findPackageUpper}_ROOT=/opt/$findPackageName \
                   -DSOMEOTHERPACKAGE_ROOT=/opt/some-other-package
             ```
-            EOT;
-    } else {
-        $footer = <<<EOT
-            ## Basic usage
 
-            ```cmake
-            # CMakeLists.txt
-            include(cmake/$moduleName.cmake)
-            ```
             EOT;
     }
 
-    if (1 !== preg_match('/## Basic usage[\r\n]/', $content, $matches)) {
-        $markdown .= "\n" . $footer . "\n";
-    }
-
-    if (isset($footer_2)) {
-        $markdown .= "\n" . $footer_2 . "\n";
-    }
-
     if (!file_exists($destination)) {
         mkdir($destination, 0777, true);
     }

cmake/Zend/cmake/CheckFloatPrecision.cmake

@@ -26,6 +26,13 @@ See: https://wiki.php.net/rfc/rounding
 * `HAVE_FPU_INLINE_ASM_X86`
 
   Whether FPU control word can be manipulated by inline assembler.
+
+## Usage
+
+```cmake
+# CMakeLists.txt
+include(cmake/CheckFloatPrecision.cmake)
+```
 #]=============================================================================]
 
 include_guard(GLOBAL)

cmake/Zend/cmake/CheckGlobalRegisterVariables.cmake

@@ -12,6 +12,13 @@ See also: [GCC global register variables](https://gcc.gnu.org/onlinedocs/gcc/Glo
 * `HAVE_GCC_GLOBAL_REGS`
 
   Whether global register variables are supported.
+
+## Usage
+
+```cmake
+# CMakeLists.txt
+include(cmake/CheckGlobalRegisterVariables.cmake)
+```
 #]=============================================================================]
 
 include_guard(GLOBAL)

cmake/Zend/cmake/CheckMMAlignment.cmake

@@ -9,6 +9,13 @@ also does the logarithmic test.
 * `ZEND_MM_ALIGNMENT`
 * `ZEND_MM_ALIGNMENT_LOG2`
 * `ZEND_MM_NEED_EIGHT_BYTE_REALIGNMENT`
+
+## Usage
+
+```cmake
+# CMakeLists.txt
+include(cmake/CheckMMAlignment.cmake)
+```
 #]=============================================================================]
 
 include_guard(GLOBAL)

cmake/Zend/cmake/CheckStackDirection.cmake

@@ -8,6 +8,13 @@ Check whether the stack grows downwards. Assumes contiguous stack.
 * `ZEND_CHECK_STACK_LIMIT`
 
   Whether checking the stack limit is supported.
+
+## Usage
+
+```cmake
+# CMakeLists.txt
+include(cmake/CheckStackDirection.cmake)
+```
 #]=============================================================================]
 
 include_guard(GLOBAL)

cmake/Zend/cmake/CheckStrerrorR.cmake

@@ -14,6 +14,13 @@ version.
 
   Whether `strerror_r()` returns a `char *` message, otherwise it returns an
   `int` error number.
+
+## Usage
+
+```cmake
+# CMakeLists.txt
+include(cmake/CheckStrerrorR.cmake)
+```
 #]=============================================================================]
 
 include_guard(GLOBAL)

cmake/Zend/cmake/Fibers.cmake

@@ -24,6 +24,13 @@ platform, otherwise it checks if ucontext can be used.
 
   Interface library using Boost fiber assembly files and compile options if
   available.
+
+## Usage
+
+```cmake
+# CMakeLists.txt
+include(cmake/Fibers.cmake)
+```
 #]=============================================================================]
 
 include_guard(GLOBAL)

cmake/Zend/cmake/MaxExecutionTimers.cmake

@@ -26,6 +26,13 @@ Check whether to enable Zend max execution timers.
 
   Includes possible additional library to be linked for using `timer_create()`
   and a compile definition.
+
+## Usage
+
+```cmake
+# CMakeLists.txt
+include(cmake/MaxExecutionTimers.cmake)
+```
 #]=============================================================================]
 
 include_guard(GLOBAL)

cmake/cmake/modules/FindACL.cmake

@@ -26,6 +26,13 @@ Module defines the following `IMPORTED` target(s):
 * Set `ACL_USE_USER_GROUP` to `TRUE` before calling `find_package(ACL)` to also
   check if the ACL library supports `ACL_USER` and `ACL_GROUP`. For example,
   macOS doesn't have support for user/group.
+
+## Usage
+
+```cmake
+# CMakeLists.txt
+find_package(ACL)
+```
 #]=============================================================================]
 
 include(CheckSourceCompiles)