Merge branch 'PHP-8.5'

Author: petk

cmake/CMakeLists.txt

@@ -253,12 +253,14 @@ install(
   PATTERN "FindPHP.cmake" EXCLUDE
 )
 
-set(CMAKE_EXPERIMENTAL_EXPORT_PACKAGE_INFO "b80be207-778e-46ba-8080-b23bba22639e")
+if(PHP_ENABLE_CMAKE_EXPERIMENTAL_FEATURES)
+  set(CMAKE_EXPERIMENTAL_EXPORT_PACKAGE_INFO "b80be207-778e-46ba-8080-b23bba22639e")
 
-install(
-  PACKAGE_INFO PHP
-  EXPORT php_development_export
-)
+  install(
+    PACKAGE_INFO PHP
+    EXPORT php_development_export
+  )
+endif()
 
 ################################################################################
 # Enable testing and configure test settings.

cmake/cmake/Configuration.cmake

@@ -72,6 +72,12 @@ set(
 )
 mark_as_advanced(PHP_BUILD_PROVIDER)
 
+option(
+  PHP_ENABLE_CMAKE_EXPERIMENTAL_FEATURES
+  "Enable CMake experimental features"
+)
+mark_as_advanced(PHP_ENABLE_CMAKE_EXPERIMENTAL_FEATURES)
+
 set(
   CACHE{PHP_INCLUDE_PREFIX}
   TYPE STRING

cmake/cmake/presets/all-enabled.json

@@ -8,6 +8,7 @@
       "binaryDir": "${sourceDir}/php-build/all-enabled",
       "installDir": "/tmp",
       "cacheVariables": {
+        "PHP_ENABLE_CMAKE_EXPERIMENTAL_FEATURES": true,
         "PHP_PEAR": true,
 
         "PHP_EXT_BCMATH": true,

docs/cmake/configuration.md

@@ -197,6 +197,7 @@ Some useful overridable configuration options built into CMake itself. All these
 * [`PHP_DEFAULT_SHORT_OPEN_TAG`](/docs/cmake/variables/PHP_DEFAULT_SHORT_OPEN_TAG.md)
 * [`PHP_DMALLOC`](/docs/cmake/variables/PHP_DMALLOC.md)
 * [`PHP_DTRACE`](/docs/cmake/variables/PHP_DTRACE.md)
+* [`PHP_ENABLE_CMAKE_EXPERIMENTAL_FEATURES`](/docs/cmake/variables/PHP_ENABLE_CMAKE_EXPERIMENTAL_FEATURES.md)
 * [`PHP_GCOV`](/docs/cmake/variables/PHP_GCOV.md)
 * [`PHP_MEMORY_SANITIZER`](/docs/cmake/variables/_PHP_MEMORY_SANITIZER.md)
 * [`PHP_EXTENSION_DIR`](/docs/cmake/variables/PHP_EXTENSION_DIR.md)

docs/cmake/variables/PHP_ENABLE_CMAKE_EXPERIMENTAL_FEATURES.md

@@ -0,0 +1,7 @@
+# `PHP_ENABLE_CMAKE_EXPERIMENTAL_FEATURES`
+
+* Default: `OFF`
+* Values: `ON|OFF`
+
+Enables CMake experimental features, such as exported
+[CPS](https://cps-org.github.io/cps/) file to be installed.