Merge branch 'PHP-8.3' into PHP-8.4

Author: petk

cmake/CMakeLists.txt

@@ -5,8 +5,6 @@ include(cmake/CMakeDefaults.cmake)
 
 message(STATUS "Initializing PHP build system")
 message(STATUS "=============================")
-message(STATUS "CMake version: ${CMAKE_VERSION}")
-message(STATUS "CMake generator: ${CMAKE_GENERATOR}")
 
 # Set the PHP_VERSION_* variables from configure.ac.
 include(cmake/Version.cmake)

cmake/cmake/Bootstrap.cmake

@@ -17,16 +17,6 @@ if(CMAKE_CXX_COMPILER)
   enable_language(CXX)
 endif()
 
-# Output linker information.
-if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.29)
-  if(CMAKE_C_COMPILER_LINKER)
-    message(STATUS "C linker: ${CMAKE_C_COMPILER_LINKER}")
-  endif()
-  if(CMAKE_CXX_COMPILER_LINKER)
-    message(STATUS "CXX linker: ${CMAKE_CXX_COMPILER_LINKER}")
-  endif()
-endif()
-
 # Check whether IPO/LTO can be enabled.
 include(PHP/Optimization)
 

cmake/cmake/modules/PHP/FeatureSummary.cmake

@@ -73,39 +73,64 @@ function(php_feature_summary_preamble result)
     php_feature_summary_preamble_add_item("Zend module API number" "${zendModuleApi}" preamble)
   endif()
 
-  if(CMAKE_C_COMPILER_LOADED)
-    set(compiler "")
-    if(CMAKE_C_COMPILER_ID)
-      string(APPEND compiler "${CMAKE_C_COMPILER_ID}")
-    endif()
-    if(CMAKE_C_COMPILER_VERSION)
-      string(APPEND compiler " ${CMAKE_C_COMPILER_VERSION}")
-    endif()
-    string(STRIP "${compiler}" compiler)
-    if(compiler)
-      string(APPEND compiler " (${CMAKE_C_COMPILER})")
-    else()
-      string(APPEND compiler "${CMAKE_C_COMPILER}")
+  get_property(enabledLanguages GLOBAL PROPERTY ENABLED_LANGUAGES)
+  foreach(language IN ITEMS ${enabledLanguages})
+    # Add compiler info.
+    if(CMAKE_${language}_COMPILER_LOADED)
+      set(compiler "")
+      if(CMAKE_${language}_COMPILER_ID)
+        string(APPEND compiler "${CMAKE_${language}_COMPILER_ID}")
+      endif()
+      if(CMAKE_${language}_COMPILER_VERSION)
+        string(APPEND compiler " ${CMAKE_${language}_COMPILER_VERSION}")
+      endif()
+      string(STRIP "${compiler}" compiler)
+      if(compiler)
+        string(APPEND compiler " (${CMAKE_${language}_COMPILER})")
+      else()
+        string(APPEND compiler "${CMAKE_${language}_COMPILER}")
+      endif()
+      php_feature_summary_preamble_add_item(
+        "${language} compiler"
+        "${compiler}"
+        preamble
+      )
     endif()
-    php_feature_summary_preamble_add_item("C compiler" "${compiler}" preamble)
-  endif()
 
-  if(CMAKE_CXX_COMPILER_LOADED)
-    set(compiler "")
-    if(CMAKE_CXX_COMPILER_ID)
-      string(APPEND compiler "${CMAKE_CXX_COMPILER_ID}")
-    endif()
-    if(CMAKE_CXX_COMPILER_VERSION)
-      string(APPEND compiler " ${CMAKE_CXX_COMPILER_VERSION}")
-    endif()
-    string(STRIP "${compiler}" compiler)
-    if(compiler)
-      string(APPEND compiler " (${CMAKE_CXX_COMPILER})")
-    else()
-      string(APPEND compiler "${CMAKE_CXX_COMPILER}")
+    # Add linker info.
+    if(CMAKE_${language}_COMPILER_LINKER)
+      set(linker "")
+      if(CMAKE_${language}_COMPILER_LINKER_ID)
+        string(APPEND linker "${CMAKE_${language}_COMPILER_LINKER_ID}")
+      endif()
+      if(CMAKE_${language}_COMPILER_LINKER_VERSION)
+        string(APPEND linker " ${CMAKE_${language}_COMPILER_LINKER_VERSION}")
+      endif()
+      string(STRIP "${linker}" linker)
+      if(linker)
+        string(APPEND linker " (${CMAKE_${language}_COMPILER_LINKER})")
+      else()
+        string(APPEND linker "${CMAKE_${language}_COMPILER_LINKER}")
+      endif()
+      php_feature_summary_preamble_add_item(
+        "${language} linker"
+        "${linker}"
+        preamble
+      )
     endif()
-    php_feature_summary_preamble_add_item("CXX compiler" "${compiler}" preamble)
-  endif()
+  endforeach()
+
+  php_feature_summary_preamble_add_item(
+    "CMake version"
+    "${CMAKE_VERSION}"
+    preamble
+  )
+
+  php_feature_summary_preamble_add_item(
+    "CMake generator"
+    "${CMAKE_GENERATOR}"
+    preamble
+  )
 
   get_property(isMultiConfig GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
   if(isMultiConfig)