Rename php_sapis_config to php_sapi (PHP::SAPI)

Author: petk

cmake/Zend/CMakeLists.txt

@@ -319,27 +319,37 @@ set_target_properties(
 )
 
 ################################################################################
-# Pass transitive compile and link properties to PHP configuration interface.
+# Add transitive compile and link properties to PHP configuration interface.
 ################################################################################
 
 # Cleaner COMPILE_ONLY generator expression is available in CMake >= 3.27.
 if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.27)
   target_link_libraries(php_configuration INTERFACE $<COMPILE_ONLY:Zend::Zend>)
 else()
+  target_compile_definitions(
+    php_configuration
+    INTERFACE
+      $<TARGET_PROPERTY:Zend::Zend,INTERFACE_COMPILE_DEFINITIONS>
+  )
+  target_compile_options(
+    php_configuration
+    INTERFACE
+      $<TARGET_PROPERTY:Zend::Zend,INTERFACE_COMPILE_OPTIONS>
+  )
   target_include_directories(
     php_configuration
     INTERFACE
       $<TARGET_PROPERTY:Zend::Zend,INTERFACE_INCLUDE_DIRECTORIES>
   )
-  target_compile_definitions(
+  target_link_libraries(
     php_configuration
     INTERFACE
-      $<TARGET_PROPERTY:Zend::Zend,INTERFACE_COMPILE_DEFINITIONS>
+      $<TARGET_PROPERTY:Zend::Zend,INTERFACE_LINK_LIBRARIES>
   )
 endif()
 
-target_link_libraries(php_sapis_config INTERFACE Zend::Zend)
-target_sources(php_sapis_config INTERFACE $<TARGET_OBJECTS:Zend::Zend>)
+target_link_libraries(php_sapi INTERFACE Zend::Zend)
+target_sources(php_sapi INTERFACE $<TARGET_OBJECTS:Zend::Zend>)
 
 ################################################################################
 # TSRM (Thread Safe Resource Manager) is a separate directory in php-src as it

cmake/cmake/Bootstrap.cmake

@@ -33,9 +33,7 @@ include(PHP/InterproceduralOptimization)
 # Set CMAKE_POSITION_INDEPENDENT_CODE.
 include(PHP/PositionIndependentCode)
 
-# INTERFACE library with usage requirements. All targets that need PHP compile
-# or link properties, such as include directories, global compile definitions,
-# or flags, should link to this target.
+# INTERFACE library with usage requirements.
 add_library(php_configuration INTERFACE)
 add_library(PHP::configuration ALIAS php_configuration)
 target_include_directories(
@@ -45,12 +43,10 @@ target_include_directories(
     ${PHP_SOURCE_DIR}
 )
 
-# INTERFACE library that ties all target objects and configuration together.
-# Only PHP SAPI targets should link to it.
-# See: https://cmake.org/cmake/help/latest/manual/cmake-buildsystem.7.html
-add_library(php_sapis_config INTERFACE)
-add_library(PHP::PHP ALIAS php_sapis_config)
-target_link_libraries(php_sapis_config INTERFACE PHP::configuration)
+# INTERFACE library that ties objects and configuration together for PHP SAPIs.
+add_library(php_sapi INTERFACE)
+add_library(PHP::SAPI ALIAS php_sapi)
+target_link_libraries(php_sapi INTERFACE PHP::configuration)
 
 # Create a custom target for generating files (parsers, lexers, etc.) manually:
 #   cmake --build <dir> -t php_generate_files

cmake/cmake/modules/FindGcov.cmake

@@ -188,27 +188,29 @@ macro(gcov_generate_report)
   )
 
   # Create a list of PHP SAPIs with genex for usage in the add_custom_command.
-  block(PROPAGATE php_sapis)
-    set(php_sapis "")
+  block(PROPAGATE sapis)
+    set(sapis "")
     file(GLOB directories ${PROJECT_SOURCE_DIR}/sapi/*)
     foreach(dir ${directories})
       cmake_path(GET dir FILENAME sapi)
-      list(APPEND php_sapis "$<TARGET_NAME_IF_EXISTS:php_${sapi}>")
+      list(APPEND sapis "$<TARGET_NAME_IF_EXISTS:php_${sapi}>")
     endforeach()
   endblock()
 
   add_custom_command(
     OUTPUT ${PROJECT_BINARY_DIR}/php_lcov.info
     COMMAND ${CMAKE_COMMAND} -P "CMakeFiles/GenerateGcovReport.cmake"
-    DEPENDS
-      ${php_sapis}
+    DEPENDS ${sapis}
     COMMENT "[GCOV] Generating GCOV coverage report"
+    VERBATIM
+    COMMAND_EXPAND_LISTS
   )
 
-  unset(php_sapis)
+  unset(sapis)
 
   # Create target which consumes the command via DEPENDS.
-  add_custom_target(gcov ALL
+  add_custom_target(
+    gcov ALL
     DEPENDS ${PROJECT_BINARY_DIR}/php_lcov.info
     COMMENT "[GCOV] Generating GCOV files"
   )

cmake/ext/CMakeLists.txt

@@ -72,7 +72,7 @@ foreach(extension IN LISTS extensions)
 
   add_dependencies(php_${extension} Zend::Zend)
 
-  # Pass transitive compile and link properties to PHP configuration interface.
+  # Add transitive compile and link properties to PHP configuration interface.
   # TODO: Should PHP_CLI extensions pass properties only to PHP_CLI SAPIs?
   get_target_property(type php_${extension} TYPE)
   if(NOT type MATCHES "^(MODULE|SHARED)_LIBRARY$")
@@ -102,13 +102,13 @@ foreach(extension IN LISTS extensions)
     )
 
     target_link_libraries(
-      php_sapis_config
+      php_sapi
       INTERFACE
         $<IF:$<BOOL:$<TARGET_GENEX_EVAL:PHP::${extension},$<TARGET_PROPERTY:PHP::${extension},PHP_CLI>>>,$<$<BOOL:$<TARGET_PROPERTY:PHP_CLI>>:PHP::${extension}>,PHP::${extension}>
     )
 
     target_sources(
-      php_sapis_config
+      php_sapi
       INTERFACE
         $<IF:$<BOOL:$<TARGET_GENEX_EVAL:PHP::${extension},$<TARGET_PROPERTY:PHP::${extension},PHP_CLI>>>,$<$<BOOL:$<TARGET_PROPERTY:PHP_CLI>>:$<TARGET_OBJECTS:PHP::${extension}>>,$<TARGET_OBJECTS:PHP::${extension}>>
     )

cmake/ext/skeleton/cmake/modules/FindPHP.cmake

@@ -13,7 +13,7 @@ Components:
 Module defines the following `IMPORTED` target(s):
 
 * `PHP::php` - The PHP package `IMPORTED` target, if found.
-* `PHP:embed` - The PHP embed SAPI, if found.
+* `PHP::embed` - The PHP embed SAPI, if found.
 
 ## Result variables
 

cmake/main/CMakeLists.txt

@@ -119,7 +119,7 @@ target_link_libraries(php_main PRIVATE PHP::configuration)
 add_compile_definitions(ZEND_ENABLE_STATIC_TSRMLS_CACHE)
 
 ################################################################################
-# Add transitive compile and link properties to PHP interface targets.
+# Add transitive compile and link properties to PHP configuration interface.
 ################################################################################
 
 target_compile_definitions(
@@ -147,8 +147,8 @@ target_include_directories(
     $<TARGET_PROPERTY:PHP::main,INTERFACE_SYSTEM_INCLUDE_DIRECTORIES>
 )
 
-target_link_libraries(php_sapis_config INTERFACE PHP::main)
-target_sources(php_sapis_config INTERFACE $<TARGET_OBJECTS:PHP::main>)
+target_link_libraries(php_sapi INTERFACE PHP::main)
+target_sources(php_sapi INTERFACE $<TARGET_OBJECTS:PHP::main>)
 
 ################################################################################
 # Add DTrace.
@@ -259,7 +259,7 @@ add_library(php_main_internal_functions OBJECT internal_functions.c)
 add_library(php_main_internal_functions_cli OBJECT internal_functions_cli.c)
 
 target_sources(
-  php_sapis_config
+  php_sapi
   INTERFACE
     $<IF:$<BOOL:$<TARGET_PROPERTY:PHP_CLI>>,$<TARGET_OBJECTS:php_main_internal_functions_cli>,$<TARGET_OBJECTS:php_main_internal_functions>>
 )

cmake/sapi/apache2handler/CMakeLists.txt

@@ -109,7 +109,7 @@ endif()
 target_link_libraries(
   php_apache2handler
   PRIVATE
-    PHP::PHP
+    PHP::SAPI
     Apache::Apache
 )
 

cmake/sapi/cgi/CMakeLists.txt

@@ -41,7 +41,7 @@ target_compile_definitions(php_cgi PRIVATE ZEND_ENABLE_STATIC_TSRMLS_CACHE)
 target_link_libraries(
   php_cgi
   PRIVATE
-    PHP::PHP
+    PHP::SAPI
     $<$<PLATFORM_ID:Windows>:ws2_32;kernel32;advapi32>
 )
 

cmake/sapi/cli/CMakeLists.txt

@@ -102,7 +102,7 @@ target_compile_definitions(
 target_link_libraries(
   php_cli
   PRIVATE
-    PHP::PHP
+    PHP::SAPI
     $<$<PLATFORM_ID:Windows>:ws2_32;shell32>
 )
 
@@ -158,7 +158,7 @@ if(SAPI_CLI_WIN_NO_CONSOLE)
   target_link_libraries(
     php_cli_win_no_console
     PRIVATE
-      PHP::PHP
+      PHP::SAPI
       shell32
   )
 

cmake/sapi/embed/CMakeLists.txt

@@ -47,7 +47,7 @@ target_sources(
 target_link_libraries(
   php_embed
   PRIVATE
-    PHP::PHP
+    PHP::SAPI
 )
 
 target_compile_definitions(php_embed PRIVATE ZEND_ENABLE_STATIC_TSRMLS_CACHE)