Merge branch 'PHP-8.4' into PHP-8.5

Author: petk

cmake/cmake/modules/PHP/AddCustomCommand.cmake

@@ -99,9 +99,9 @@ function(php_add_custom_command)
   endif()
 
   if(NOT CMAKE_CROSSCOMPILING)
-    set(PHP_EXECUTABLE "$<TARGET_FILE:PHP::sapi::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::sapi::cli>")
+    set(php_executable "${CMAKE_CROSSCOMPILING_EMULATOR};$<TARGET_FILE:PHP::sapi::cli>")
   else()
     return()
   endif()
@@ -111,7 +111,7 @@ function(php_add_custom_command)
     ALL
     COMMAND
       ${CMAKE_COMMAND}
-      -D "PHP_EXECUTABLE=${PHP_EXECUTABLE}"
+      -D "PHP_EXECUTABLE=${php_executable}"
       -D "OUTPUT=${parsed_OUTPUT}"
       -D "PHP_COMMAND=${parsed_PHP_COMMAND}"
       -D "DEPENDS=${parsed_DEPENDS}"

cmake/ext/phar/CMakeLists.txt

@@ -126,9 +126,9 @@ if(NOT TARGET PHP::sapi::cli)
 endif()
 
 if(NOT CMAKE_CROSSCOMPILING)
-  set(PHP_EXECUTABLE "$<TARGET_FILE:PHP::sapi::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::sapi::cli>")
+  set(php_executable "${CMAKE_CROSSCOMPILING_EMULATOR};$<TARGET_FILE:PHP::sapi::cli>")
 else()
   return()
 endif()
@@ -152,7 +152,7 @@ cmake_path(
 add_custom_command(
   OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/phar.php
   COMMAND
-    ${PHP_EXECUTABLE}
+    ${php_executable}
       -n
       ${phar_shared_options}
       -d open_basedir=
@@ -168,7 +168,7 @@ add_custom_command(
 add_custom_command(
   OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/phar.phar
   COMMAND
-    ${PHP_EXECUTABLE}
+    ${php_executable}
       -n
       ${phar_shared_options}
       -d open_basedir=
@@ -245,7 +245,7 @@ install(DIRECTORY DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT php)
 string(CONFIGURE [[
   execute_process(
     COMMAND
-      "@PHP_EXECUTABLE@"
+      "@php_executable@"
         -n
         @phar_shared_options@
         -d open_basedir=

cmake/pear/CMakeLists.txt

@@ -120,19 +120,19 @@ block()
   endforeach()
 endblock()
 
-set(PHP_EXECUTABLE "")
+set(php_executable "")
 if(NOT CMAKE_CROSSCOMPILING)
-  set(PHP_EXECUTABLE "$<TARGET_FILE:PHP::sapi::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::sapi::cli>")
+  set(php_executable "${CMAKE_CROSSCOMPILING_EMULATOR};$<TARGET_FILE:PHP::sapi::cli>")
 endif()
 
 string(CONFIGURE [[
   set(php_pear_install_dir "$<PATH:ABSOLUTE_PATH,NORMALIZE,@PHP_PEAR_DIR@,${CMAKE_INSTALL_PREFIX}>")
   set(php_pear_install_bin_dir "$<PATH:ABSOLUTE_PATH,NORMALIZE,@CMAKE_INSTALL_BINDIR@,${CMAKE_INSTALL_PREFIX}>")
   set(php_pear_current_source_dir "@CMAKE_CURRENT_SOURCE_DIR@")
   set(php_pear_current_binary_dir "@CMAKE_CURRENT_BINARY_DIR@")
-  set(php_pear_php_executable "@PHP_EXECUTABLE@")
+  set(php_pear_php_executable "@php_executable@")
   set(php_pear_extension_dir "$<PATH:ABSOLUTE_PATH,NORMALIZE,@PHP_EXTENSION_DIR@,${CMAKE_INSTALL_PREFIX}>")
   set(PHP_EXT_OPENSSL_SHARED "@PHP_EXT_OPENSSL_SHARED@")
   set(PHP_EXT_XML_SHARED "@PHP_EXT_XML_SHARED@")