Merge branch 'PHP-8.3' into PHP-8.4

Author: petk

cmake/ext/CMakeLists.txt

@@ -80,23 +80,49 @@ foreach(extension IN LISTS extensions)
 
   add_dependencies(php_${extension} Zend::Zend)
 
-  # Add extension's PUBLIC/INTERFACE compile properties to configuration.
-  # Cleaner COMPILE_ONLY generator expression is available in CMake >= 3.27.
-  if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.27)
-    target_link_libraries(
+  # Add extension's transitive compile and link properties to configuration.
+  # The INTERFACE_SOURCES are propagated separately only to PHP::PHP.
+  # See: https://cmake.org/cmake/help/latest/manual/cmake-buildsystem.7.html
+  # TODO: Should PHP_CLI extensions pass properties only to PHP_CLI SAPIs?
+  get_target_property(type php_${extension} TYPE)
+  if(NOT type MATCHES "^(MODULE|SHARED)_LIBRARY$")
+    target_compile_definitions(
+      php_configuration
+      INTERFACE
+        $<TARGET_PROPERTY:PHP::${extension},INTERFACE_COMPILE_DEFINITIONS>
+    )
+
+    target_compile_options(
+      php_configuration
+      INTERFACE
+        $<TARGET_PROPERTY:PHP::${extension},INTERFACE_COMPILE_OPTIONS>
+    )
+
+    target_compile_features(
       php_configuration
       INTERFACE
-        $<COMPILE_ONLY:PHP::${extension}>
+        $<TARGET_PROPERTY:PHP::${extension},INTERFACE_COMPILE_FEATURES>
     )
-  else()
-    # TODO: Fix this better. Either require 3.27, or limit/adjust compile
-    # properties propagated globally. Also, shared extensions shouldn't
-    # propagate globally.
-    # https://cmake.org/cmake/help/latest/manual/cmake-buildsystem.7.html#id36
+
     target_include_directories(
       php_configuration
       INTERFACE
         $<TARGET_PROPERTY:PHP::${extension},INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:PHP::${extension},INTERFACE_SYSTEM_INCLUDE_DIRECTORIES>
+    )
+
+    target_link_libraries(
+      php_extensions
+      INTERFACE
+        $<IF:$<BOOL:$<TARGET_PROPERTY:PHP::${extension},PHP_CLI>>,$<$<BOOL:$<TARGET_PROPERTY:PHP_CLI>>:$<LINK_ONLY:PHP::${extension}>>,$<LINK_ONLY:PHP::${extension}>>
+    )
+
+    target_sources(
+      php_extensions
+      INTERFACE
+        $<IF:$<BOOL:$<TARGET_PROPERTY:PHP::${extension},PHP_CLI>>,$<$<BOOL:$<TARGET_PROPERTY:PHP_CLI>>:$<TARGET_OBJECTS:PHP::${extension}>>,$<TARGET_OBJECTS:PHP::${extension}>>
+
+        $<IF:$<BOOL:$<TARGET_PROPERTY:PHP::${extension},PHP_CLI>>,$<$<BOOL:$<TARGET_PROPERTY:PHP_CLI>>:$<TARGET_PROPERTY:PHP::${extension},INTERFACE_SOURCES>>,$<TARGET_PROPERTY:PHP::${extension},INTERFACE_SOURCES>>
     )
   endif()
 
@@ -109,44 +135,6 @@ foreach(extension IN LISTS extensions)
       $<TARGET_PROPERTY:php_configuration,INTERFACE_COMPILE_OPTIONS>
   )
 
-  get_target_property(type php_${extension} TYPE)
-  get_target_property(isCli php_${extension} PHP_CLI)
-  if(NOT type MATCHES "^(MODULE|SHARED)_LIBRARY$")
-    # If extension is STATIC library link as whole archive, otherwise link
-    # normally. CLI-based extensions are linked only to CLI-based SAPIs.
-    if(NOT isCli)
-      target_link_libraries(
-        php_extensions
-        INTERFACE
-          $<IF:$<STREQUAL:$<TARGET_PROPERTY:PHP::${extension},TYPE>,STATIC_LIBRARY>,$<LINK_LIBRARY:WHOLE_ARCHIVE,PHP::${extension}>,PHP::${extension}>
-      )
-
-      target_sources(
-        php_extensions
-        INTERFACE
-          # If extension is OBJECT library:
-          $<$<STREQUAL:$<TARGET_PROPERTY:PHP::${extension},TYPE>,OBJECT_LIBRARY>:$<TARGET_OBJECTS:PHP::${extension}>>
-          # If extension and linked target (SAPI) are both STATIC libraries:
-          $<$<AND:$<STREQUAL:$<TARGET_PROPERTY:TYPE>,STATIC_LIBRARY>,$<STREQUAL:$<TARGET_PROPERTY:PHP::${extension},TYPE>,STATIC_LIBRARY>>:$<TARGET_OBJECTS:PHP::${extension}>>
-      )
-    else()
-      target_link_libraries(
-        php_extensions
-        INTERFACE
-          $<$<BOOL:$<TARGET_PROPERTY:PHP_CLI>>:$<IF:$<STREQUAL:$<TARGET_PROPERTY:PHP::${extension},TYPE>,STATIC_LIBRARY>,$<LINK_LIBRARY:WHOLE_ARCHIVE,PHP::${extension}>,PHP::${extension}>>
-      )
-
-      target_sources(
-        php_extensions
-        INTERFACE
-          # If extension is OBJECT library:
-          $<$<BOOL:$<TARGET_PROPERTY:PHP_CLI>>:$<$<STREQUAL:$<TARGET_PROPERTY:PHP::${extension},TYPE>,OBJECT_LIBRARY>:$<TARGET_OBJECTS:PHP::${extension}>>>
-          # If extension and linked target (SAPI) are both STATIC libraries:
-          $<$<BOOL:$<TARGET_PROPERTY:PHP_CLI>>:$<$<AND:$<STREQUAL:$<TARGET_PROPERTY:TYPE>,STATIC_LIBRARY>,$<STREQUAL:$<TARGET_PROPERTY:PHP::${extension},TYPE>,STATIC_LIBRARY>>:$<TARGET_OBJECTS:PHP::${extension}>>>
-      )
-    endif()
-  endif()
-
   message(CHECK_PASS "enabled")
   list(POP_BACK CMAKE_MESSAGE_CONTEXT)
 endforeach()

cmake/ext/standard/CMakeLists.txt

@@ -574,8 +574,12 @@ target_link_libraries(
   PRIVATE $<TARGET_PROPERTY:php_standard,LINK_LIBRARIES>
 )
 
-add_dependencies(php_standard_functions_cli php_standard)
-add_dependencies(php_standard_functions php_standard)
+# ext/standard functions objects based on the SAPI type.
+target_sources(
+  php_standard
+  INTERFACE
+    $<IF:$<BOOL:$<TARGET_PROPERTY:PHP_CLI>>,$<TARGET_OBJECTS:php_standard_functions_cli>,$<TARGET_OBJECTS:php_standard_functions>>
+)
 
 ################################################################################
 # Configuration header

cmake/main/CMakeLists.txt

@@ -216,9 +216,6 @@ target_sources(
     $<$<AND:$<STREQUAL:$<TARGET_PROPERTY:TYPE>,STATIC_LIBRARY>,$<STREQUAL:$<TARGET_PROPERTY:Zend::Zend,TYPE>,STATIC_LIBRARY>>:$<TARGET_OBJECTS:Zend::Zend>>
 
     $<$<TARGET_EXISTS:PHP::windows>:$<TARGET_OBJECTS:PHP::windows>>
-
-    # ext/standard functions objects based on the SAPI type.
-    $<IF:$<BOOL:$<TARGET_PROPERTY:PHP_CLI>>,$<TARGET_OBJECTS:php_standard_functions_cli>,$<TARGET_OBJECTS:php_standard_functions>>
 )
 
 ################################################################################