Rename all PHP SAPI targets to php_sapi_<sapi-name> (PHP::SAPI::<sapi-name)

Author: petk

cmake/cmake/Testing.cmake

@@ -2,7 +2,7 @@
 Enable and configure tests.
 #]=============================================================================]
 
-if(NOT TARGET php_cli)
+if(NOT TARGET PHP::SAPI::cli)
   return()
 endif()
 
@@ -32,7 +32,7 @@ block()
   add_test(
     NAME PHP
     COMMAND
-      php_cli
+      PHP::SAPI::cli
         -n
         -d open_basedir=
         -d output_buffering=0

cmake/cmake/modules/FindGcov.cmake

@@ -193,7 +193,7 @@ macro(gcov_generate_report)
     file(GLOB directories ${PROJECT_SOURCE_DIR}/sapi/*)
     foreach(dir ${directories})
       cmake_path(GET dir FILENAME sapi)
-      list(APPEND sapis "$<TARGET_NAME_IF_EXISTS:php_${sapi}>")
+      list(APPEND sapis "$<TARGET_NAME_IF_EXISTS:php_sapi_${sapi}>")
     endforeach()
   endblock()
 

cmake/cmake/modules/PHP/AddCustomCommand.cmake

@@ -94,14 +94,14 @@ function(php_add_custom_command)
     return()
   endif()
 
-  if(NOT TARGET php_cli)
+  if(NOT TARGET PHP::SAPI::cli)
     return()
   endif()
 
   if(NOT CMAKE_CROSSCOMPILING)
-    set(PHP_EXECUTABLE "$<TARGET_FILE:php_cli>")
+    set(PHP_EXECUTABLE "$<TARGET_FILE:PHP::SAPI::cli>")
   elseif(CMAKE_CROSSCOMPILING AND CMAKE_CROSSCOMPILING_EMULATOR)
-    set(PHP_EXECUTABLE "${CMAKE_CROSSCOMPILING_EMULATOR};$<TARGET_FILE:php_cli>")
+    set(PHP_EXECUTABLE "${CMAKE_CROSSCOMPILING_EMULATOR};$<TARGET_FILE:PHP::SAPI::cli>")
   else()
     return()
   endif()

cmake/cmake/modules/PHP/Rebuild.cmake

@@ -3,11 +3,11 @@
 
 Ensure all project targets are rebuilt as needed.
 
-When PHP is not found on the system, the `php_cli` target is used to generate
-certain files during development. This can lead to cyclic dependencies among
-targets if custom commands depend on the `php_cli` target. While such automatic
-rebuilding is not considered good practice, it ensures that all targets are kept
-up to date.
+When PHP is not found on the system, the `php_sapi_cli` (alias `PHP::SAPI::cli`)
+target is used to generate certain files during development. This can lead to
+cyclic dependencies among targets if custom commands depend on the
+`PHP::SAPI::cli` target. While such automatic rebuilding is not considered good
+practice, it ensures that all targets are kept up to date.
 
 TODO: This works only for a limited set of cases for now and will be refactored.
 #]=============================================================================]

cmake/cmake/modules/PHP/Stubs.cmake

@@ -37,9 +37,9 @@ function(_php_stubs_get_php_command result)
   endif()
 
   if(NOT CMAKE_CROSSCOMPILING)
-    set(command $<TARGET_FILE:php_cli>)
+    set(command $<TARGET_FILE:PHP::SAPI::cli>)
   elseif(CMAKE_CROSSCOMPILING AND CMAKE_CROSSCOMPILING_EMULATOR)
-    set(command ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:php_cli>)
+    set(command ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:PHP::SAPI::cli>)
   else()
     return(PROPAGATE ${result})
   endif()

cmake/ext/phar/CMakeLists.txt

@@ -120,14 +120,14 @@ install(
 # The phar command-line script.
 ################################################################################
 
-if(NOT TARGET php_cli)
+if(NOT TARGET PHP::SAPI::cli)
   return()
 endif()
 
 if(NOT CMAKE_CROSSCOMPILING)
-  set(PHP_EXECUTABLE "$<TARGET_FILE:php_cli>")
+  set(PHP_EXECUTABLE "$<TARGET_FILE:PHP::SAPI::cli>")
 elseif(CMAKE_CROSSCOMPILING AND CMAKE_CROSSCOMPILING_EMULATOR)
-  set(PHP_EXECUTABLE "${CMAKE_CROSSCOMPILING_EMULATOR};$<TARGET_FILE:php_cli>")
+  set(PHP_EXECUTABLE "${CMAKE_CROSSCOMPILING_EMULATOR};$<TARGET_FILE:PHP::SAPI::cli>")
 else()
   return()
 endif()
@@ -182,7 +182,7 @@ add_custom_command(
         -p 0
         -s ${CMAKE_CURRENT_SOURCE_DIR}/phar/phar.php
         -h sha1
-        -b "$<TARGET_FILE:php_cli>"
+        -b "$<TARGET_FILE:PHP::SAPI::cli>"
         ${CMAKE_CURRENT_SOURCE_DIR}/phar
   DEPENDS
     ${CMAKE_CURRENT_BINARY_DIR}/phar.php
@@ -231,7 +231,7 @@ add_custom_target(
   php_phar_generate_file
   ALL
   DEPENDS
-    php_cli
+    PHP::SAPI::cli
     php_phar
     ${dependentFiles}
     php_phar_generated_phar
@@ -259,7 +259,7 @@ install(CODE "
           -p 0
           -s ${CMAKE_CURRENT_SOURCE_DIR}/phar/phar.php
           -h sha1
-          -b $<PATH:ABSOLUTE_PATH,NORMALIZE,${CMAKE_INSTALL_BINDIR},\${CMAKE_INSTALL_PREFIX}>/$<TARGET_FILE_NAME:php_cli>
+          -b $<PATH:ABSOLUTE_PATH,NORMALIZE,${CMAKE_INSTALL_BINDIR},\${CMAKE_INSTALL_PREFIX}>/$<TARGET_FILE_NAME:PHP::SAPI::cli>
           ${CMAKE_CURRENT_SOURCE_DIR}/phar
   )
 

cmake/pear/CMakeLists.txt

@@ -123,9 +123,9 @@ endblock()
 
 set(PHP_EXECUTABLE "")
 if(NOT CMAKE_CROSSCOMPILING)
-  set(PHP_EXECUTABLE "$<TARGET_FILE:php_cli>")
+  set(PHP_EXECUTABLE "$<TARGET_FILE:PHP::SAPI::cli>")
 elseif(CMAKE_CROSSCOMPILING AND CMAKE_CROSSCOMPILING_EMULATOR)
-  set(PHP_EXECUTABLE "${CMAKE_CROSSCOMPILING_EMULATOR};$<TARGET_FILE:php_cli>")
+  set(PHP_EXECUTABLE "${CMAKE_CROSSCOMPILING_EMULATOR};$<TARGET_FILE:PHP::SAPI::cli>")
 endif()
 
 php_install(CODE "
@@ -140,7 +140,7 @@ php_install(CODE "
   set(PHP_BINARY_DIR ${PHP_BINARY_DIR})
   set(CMAKE_SYSTEM_NAME ${CMAKE_SYSTEM_NAME})
   set(PHP_PEAR_TEMP_DIR \"${PHP_PEAR_TEMP_DIR}\")
-  set(phpPearInstalledPhpBin \"\${phpPearInstallBinDir}/$<TARGET_FILE_NAME:php_cli>\")
+  set(phpPearInstalledPhpBin \"\${phpPearInstallBinDir}/$<TARGET_FILE_NAME:PHP::SAPI::cli>\")
   set(phpPearPhpProgramPrefix \"${PHP_PROGRAM_PREFIX}\")
   set(phpPearPhpProgramSuffix \"${PHP_PROGRAM_SUFFIX}\")
   set(phpPearInstallSysconfDir \"\${CMAKE_INSTALL_FULL_SYSCONFDIR}\")

cmake/sapi/CMakeLists.txt

@@ -36,7 +36,7 @@ foreach(sapi IN LISTS sapis)
   add_subdirectory("${sapi}")
 
   list(POP_BACK CMAKE_MESSAGE_INDENT)
-  if(TARGET php_${sapi})
+  if(TARGET php_sapi_${sapi})
     set_property(GLOBAL APPEND PROPERTY PHP_SAPIS ${sapi})
     message(CHECK_PASS "enabled")
   else()

cmake/sapi/apache2handler/CMakeLists.txt

@@ -42,11 +42,11 @@ if(NOT SAPI_APACHE2HANDLER)
   return()
 endif()
 
-add_library(php_apache2handler SHARED)
-add_library(PHP::apache2handler ALIAS php_apache2handler)
+add_library(php_sapi_apache2handler SHARED)
+add_library(PHP::SAPI::apache2handler ALIAS php_sapi_apache2handler)
 
 target_sources(
-  php_apache2handler
+  php_sapi_apache2handler
   PRIVATE
     apache_config.c
     mod_php.c
@@ -56,13 +56,13 @@ target_sources(
 )
 
 set_target_properties(
-  php_apache2handler
+  php_sapi_apache2handler
   PROPERTIES
     OUTPUT_NAME apache
 )
 
 target_compile_definitions(
-  php_apache2handler
+  php_sapi_apache2handler
   PRIVATE
     ZEND_ENABLE_STATIC_TSRMLS_CACHE
 )
@@ -75,6 +75,30 @@ set_package_properties(
     PURPOSE "Necessary to enable the Apache PHP SAPI."
 )
 
+target_link_libraries(
+  php_sapi_apache2handler
+  PRIVATE
+    PHP::SAPI
+    Apache::Apache
+)
+
+# Manually enable runtime linking on AIX.
+if(CMAKE_SYSTEM_NAME STREQUAL "AIX" AND EXISTS ${Apache_LIBEXECDIR}/httpd.exp)
+  include(CheckLinkerFlag)
+  check_linker_flag(
+    C
+    "LINKER:-brtl;LINKER:-bI${Apache_LIBEXECDIR}/httpd.exp"
+    _HAVE_BRTL_FLAG_C
+  )
+  if(_HAVE_BRTL_FLAG_C)
+    target_link_options(
+      php_sapi_apache2handler
+      PRIVATE
+        "$<$<PLATFORM_ID:AIX>LINKER:-brtl;LINKER:-bI${Apache_LIBEXECDIR}/httpd.exp>"
+    )
+  endif()
+endif()
+
 if(Apache_THREADED AND NOT PHP_THREAD_SAFETY)
   # Enable thread safety. Ideally, thread safety should be opt-in and such
   # automatic enabling isn't encouraged.
@@ -90,9 +114,9 @@ elseif(NOT Apache_THREADED AND NOT PHP_THREAD_SAFETY)
   cmake_language(
     DEFER
     DIRECTORY ${PHP_SOURCE_DIR}
-    CALL php_apache2handler_notice
+    CALL php_sapi_apache2handler_notice
   )
-  function(php_apache2handler_notice)
+  function(php_sapi_apache2handler_notice)
     cmake_language(DEFER CALL message NOTICE [[
 
       Notice:
@@ -106,31 +130,7 @@ elseif(NOT Apache_THREADED AND NOT PHP_THREAD_SAFETY)
   endfunction()
 endif()
 
-target_link_libraries(
-  php_apache2handler
-  PRIVATE
-    PHP::SAPI
-    Apache::Apache
-)
-
 install(
-  TARGETS php_apache2handler
+  TARGETS php_sapi_apache2handler
   DESTINATION ${CMAKE_INSTALL_LIBDIR}
 )
-
-# Manually enable runtime linking on AIX.
-if(CMAKE_SYSTEM_NAME STREQUAL "AIX" AND EXISTS ${Apache_LIBEXECDIR}/httpd.exp)
-  include(CheckLinkerFlag)
-  check_linker_flag(
-    C
-    "LINKER:-brtl;LINKER:-bI${Apache_LIBEXECDIR}/httpd.exp"
-    _HAVE_BRTL_FLAG_C
-  )
-  if(_HAVE_BRTL_FLAG_C)
-    target_link_options(
-      php_apache2handler
-      PRIVATE
-        "$<$<PLATFORM_ID:AIX>LINKER:-brtl;LINKER:-bI${Apache_LIBEXECDIR}/httpd.exp>"
-    )
-  endif()
-endif()

cmake/sapi/cgi/CMakeLists.txt

@@ -26,33 +26,33 @@ if(NOT SAPI_CGI)
   return()
 endif()
 
-add_executable(php_cgi)
-add_executable(PHP::cgi ALIAS php_cgi)
+add_executable(php_sapi_cgi)
+add_executable(PHP::SAPI::cgi ALIAS php_sapi_cgi)
 
 target_sources(
-  php_cgi
+  php_sapi_cgi
   PRIVATE
     cgi_main.c
     cgi_main.stub.php
 )
 
-target_compile_definitions(php_cgi PRIVATE ZEND_ENABLE_STATIC_TSRMLS_CACHE)
+target_compile_definitions(php_sapi_cgi PRIVATE ZEND_ENABLE_STATIC_TSRMLS_CACHE)
 
 target_link_libraries(
-  php_cgi
+  php_sapi_cgi
   PRIVATE
     PHP::SAPI
     $<$<PLATFORM_ID:Windows>:ws2_32;kernel32;advapi32>
 )
 
 target_link_options(
-  php_cgi
+  php_sapi_cgi
   PRIVATE
     $<$<COMPILE_LANG_AND_ID:C,MSVC>:/stack:67108864>
 )
 
 set_target_properties(
-  php_cgi
+  php_sapi_cgi
   PROPERTIES
     OUTPUT_NAME ${PHP_PROGRAM_PREFIX}php-cgi${PHP_PROGRAM_SUFFIX}
     # TODO: Check if there's a better solution here:
@@ -75,7 +75,7 @@ endif()
 configure_file(php-cgi.1.in php-cgi.1 @ONLY)
 
 install(
-  TARGETS php_cgi
+  TARGETS php_sapi_cgi
   RUNTIME
     DESTINATION ${CMAKE_INSTALL_BINDIR}
 )