Merge branch 'PHP-8.3' into PHP-8.4

Author: petk

cmake/cmake/modules/PHP/ConfigureFile.cmake

@@ -250,20 +250,21 @@ function(php_configure_file)
     )
   endblock()
 
-  install(CODE "
+  string(CONFIGURE [[
     block()
-      set(variables ${variables})
-      set(valuesInCode \"${valuesInCode}\")
+      set(variables @variables@)
+      set(valuesInCode "@valuesInCode@")
 
       foreach(var value IN ZIP_LISTS variables valuesInCode)
-        set(\${var} \"\${value}\")
+        set(${var} "${value}")
       endforeach()
 
       configure_file(
-        ${___phpConfigureFileTemplate}
-        ${___phpConfigureFileOutput}
+        "@___phpConfigureFileTemplate@"
+        "@___phpConfigureFileOutput@"
         @ONLY
       )
     endblock()
-  ")
+  ]] code @ONLY)
+  install(CODE "${code}")
 endfunction()

cmake/cmake/modules/PHP/PkgConfigGenerator.cmake

@@ -51,13 +51,6 @@ template.
 
 include_guard(GLOBAL)
 
-find_program(
-  PKGCONFIG_OBJDUMP_EXECUTABLE
-  NAMES objdump
-  DOC "Path to the objdump executable"
-)
-mark_as_advanced(PKGCONFIG_OBJDUMP_EXECUTABLE)
-
 # Parse given variables and create a list of options or variables for passing to
 # add_custom_command and configure_file().
 function(_pkgconfig_parse_variables variables)
@@ -197,9 +190,9 @@ function(pkgconfig_generate_pc)
         list(REMOVE_DUPLICATES libs)
       endif()
 
-      if(PKGCONFIG_OBJDUMP_EXECUTABLE)
+      if(CMAKE_OBJDUMP)
         execute_process(
-          COMMAND objdump -p ${TARGET_FILE}
+          COMMAND ${CMAKE_OBJDUMP} -p ${TARGET_FILE}
           OUTPUT_VARIABLE result
           OUTPUT_STRIP_TRAILING_WHITESPACE
           ERROR_QUIET
@@ -243,7 +236,7 @@ function(pkgconfig_generate_pc)
     pkgconfig_${targetName}
     ALL
     COMMAND ${CMAKE_COMMAND}
-      -D PKGCONFIG_OBJDUMP_EXECUTABLE=${PKGCONFIG_OBJDUMP_EXECUTABLE}
+      -D CMAKE_OBJDUMP=${CMAKE_OBJDUMP}
       -D TEMPLATE=${template}
       -D OUTPUT=${output}
       ${targetOption}