Merge branch 'PHP-8.3' into PHP-8.4

Author: petk

bin/check-cmake.php

@@ -202,7 +202,7 @@ function getProjectModules(): array
         ],
         'FindPackageMessage' => ['find_package_message'],
         'GenerateExportHeader' => ['generate_export_header'],
-        'ProcessorCount' => ['processorcount'],
+        'ProcessorCount' => ['ProcessorCount'],
         'PHP/AddCustomCommand' => ['php_add_custom_command'],
         'PHP/Bison' => ['php_bison', '/find_package\([\n ]*BISON/'],
         'PHP/CheckAttribute' => [

cmake/cmake/Testing.cmake

@@ -9,10 +9,10 @@ endif()
 enable_testing()
 
 block()
-  include(ProcessorCount)
-  processorcount(processors)
+  cmake_host_system_information(RESULT processors QUERY NUMBER_OF_LOGICAL_CORES)
 
-  if(NOT processors EQUAL 0)
+  set(parallel "")
+  if(processors)
     set(parallel -j${processors})
   endif()
 

cmake/cmake/modules/PHP/Rebuild.cmake

@@ -30,8 +30,12 @@ endfunction()
 block()
   _php_rebuild_get_all_targets(targets ${CMAKE_CURRENT_SOURCE_DIR})
 
-  include(ProcessorCount)
-  processorcount(processors)
+  cmake_host_system_information(RESULT processors QUERY NUMBER_OF_LOGICAL_CORES)
+
+  set(parallel "")
+  if(processors)
+    set(parallel --parallel ${processors})
+  endif()
 
   add_custom_command(
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/php_rebuild.timestamp
@@ -43,7 +47,7 @@ block()
         -E touch ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/php_rebuild.timestamp
     COMMAND
       ${CMAKE_COMMAND}
-        --build . --target php_rebuild -j ${processors}
+        --build . --target php_rebuild ${parallel}
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     DEPENDS ${targets}
   )