Merge branch 'PHP-8.4'

Author: petk

bin/check-cmake.php

@@ -213,10 +213,8 @@ function getProjectModules(): array
         ],
         'PHP/CheckCompilerFlag' => ['php_check_compiler_flag'],
         'PHP/ConfigureFile' => ['php_configure_file'],
-        'PHP/Extensions' => ['php_extensions_add'],
         'PHP/Install' => ['php_install'],
         'PHP/PkgConfigGenerator' => ['pkgconfig_generate_pc'],
-        'PHP/SAPIs' => ['php_sapis_add'],
         'PHP/SearchLibraries' => ['php_search_libraries'],
         'PHP/Set' => ['php_set'],
         'PHP/SystemExtensions' => ['PHP::SystemExtensions'],

cmake/CMakeLists.txt

@@ -3,10 +3,12 @@ cmake_minimum_required(VERSION 3.25...3.31)
 # Configure CMake behavior.
 include(cmake/CMakeDefaults.cmake)
 
-message("
-Initializing PHP build system
------------------------------
-")
+message(
+  STATUS
+  "-----------------------------
+   Initializing PHP build system
+   -----------------------------"
+)
 
 message(STATUS "CMake version: ${CMAKE_VERSION}")
 message(STATUS "CMake generator: ${CMAKE_GENERATOR}")
@@ -28,30 +30,16 @@ set(CMAKE_C_STANDARD_REQUIRED TRUE)
 # Configure project.
 include(cmake/Bootstrap.cmake)
 
-message("
-Configuring PHP SAPI modules
-----------------------------
-")
-include(PHP/SAPIs)
-php_sapis_add(sapi)
-
-message("
-Configuring PHP extensions
---------------------------
-")
-include(PHP/Extensions)
-php_extensions_add(ext)
-
-message("
-Configuring Zend engine
------------------------
-")
+add_subdirectory(sapi)
+add_subdirectory(ext)
 add_subdirectory(Zend)
 
-message("
-Configuring PHP
----------------
-")
+message(
+  STATUS
+  "---------------
+   Configuring PHP
+   ---------------"
+)
 add_subdirectory(pear)
 add_subdirectory(TSRM)
 add_subdirectory(win32)
@@ -92,9 +80,9 @@ include(cmake/CPack.cmake)
 
 include(PHP/FeatureSummary)
 
-message("
-License
--------
+message(
+  STATUS
+  [[License
 
 This software is subject to the PHP License, available in this
 distribution in the file LICENSE. By continuing this installation
@@ -103,4 +91,5 @@ If you do not agree with the terms of this license, you must abort
 the installation process at this point.
 
 Thank you for using PHP.
-")
+]]
+)

cmake/Zend/CMakeLists.txt

@@ -2,6 +2,13 @@
 # Zend engine.
 ################################################################################
 
+message(
+  STATUS
+  "-----------------------
+   Configuring Zend engine
+   -----------------------"
+)
+
 # Read the Zend engine version.
 block(PROPAGATE Zend_VERSION Zend_VERSION_LABEL)
   file(READ zend.h content)

cmake/cmake/Bootstrap.cmake

@@ -46,10 +46,12 @@ include(cmake/Configuration.cmake)
 # Check requirements.
 include(cmake/Requirements.cmake)
 
-message("
-Running system checks
----------------------
-")
+message(
+  STATUS
+  "---------------------
+   Running system checks
+   ---------------------"
+)
 
 # Run PHP configuration checks.
 include(cmake/ConfigureChecks.cmake)

cmake/cmake/modules/PHP/Extensions.cmake

@@ -182,6 +182,7 @@ function(_php_extensions_get directory result)
 
   foreach(path ${paths})
     cmake_path(GET path PARENT_PATH dir)
+    cmake_path(SET dir NORMALIZE ${dir})
     list(APPEND directories "${dir}")
 
     # Add extension name to a list of all extensions.

cmake/cmake/modules/PHP/FeatureSummary.cmake

@@ -13,10 +13,12 @@ include_guard(GLOBAL)
 
 include(FeatureSummary)
 
-message("
-Summary
--------
-")
+message(
+  STATUS
+  "-----------
+   PHP summary
+   -----------"
+)
 
 # Output enabled features.
 block()

cmake/cmake/modules/PHP/SAPIs.cmake

@@ -0,0 +1,13 @@
+#[=============================================================================[
+Add subdirectories of PHP extensions.
+#]=============================================================================]
+
+message(
+  STATUS
+  "--------------------------
+   Configuring PHP extensions
+   --------------------------"
+)
+
+include(PHP/Extensions)
+php_extensions_add(.)

cmake/ext/CMakeLists.txt

@@ -0,0 +1,52 @@
+#[=============================================================================[
+Add subdirectories of PHP SAPIs.
+
+## Custom CMake properties
+
+* `PHP_ALL_SAPIS`
+
+  Global property with a list of all PHP SAPIs in the sapi directory.
+
+* `PHP_SAPIS`
+
+  Global property with a list of all enabled PHP SAPIs.
+#]=============================================================================]
+
+message(
+  STATUS
+  "----------------------------
+   Configuring PHP SAPI modules
+   ----------------------------"
+)
+
+list(APPEND CMAKE_MESSAGE_CONTEXT "sapi")
+
+# Traverse CMakeLists.txt files of PHP SAPIs.
+file(GLOB sapis ${CMAKE_CURRENT_SOURCE_DIR}/*/CMakeLists.txt)
+list(TRANSFORM sapis REPLACE "${CMAKE_CURRENT_SOURCE_DIR}/|/CMakeLists.txt" "")
+set_property(GLOBAL PROPERTY PHP_ALL_SAPIS ${sapis})
+
+get_directory_property(processed SUBDIRECTORIES)
+list(TRANSFORM processed REPLACE "${CMAKE_CURRENT_SOURCE_DIR}/" "")
+
+foreach(sapi IN LISTS sapis)
+  if(NOT sapi IN_LIST processed)
+    list(APPEND CMAKE_MESSAGE_CONTEXT "${sapi}")
+    add_subdirectory("${sapi}")
+    list(POP_BACK CMAKE_MESSAGE_CONTEXT)
+  endif()
+
+  if(TARGET php_${sapi})
+    set_property(GLOBAL APPEND PROPERTY PHP_SAPIS ${sapi})
+  endif()
+endforeach()
+
+# Check if at least one SAPI is enabled.
+get_cmake_property(sapis PHP_SAPIS)
+if(NOT sapis)
+  message(
+    WARNING
+    "None of the PHP SAPIs have been enabled. If this is intentional, you "
+    "can disregard this warning."
+  )
+endif()

cmake/sapi/CMakeLists.txt

@@ -26,6 +26,7 @@ endif()
 message(CHECK_PASS "enabled")
 
 add_library(php_apache2handler SHARED)
+add_library(PHP::apache2handler ALIAS php_apache2handler)
 
 target_sources(
   php_apache2handler