Refactor targets and usage requirements

- MAX_EXECUTION_TIMERS don't need to be set in PARENT_SCOPE anymore
- Reorder some include directories
- DTrace and Dmalloc checks moved to configure checks
- usage requirements in main and win32 collected through interface
  targets directly otherwise cyclic dependencies quickly pop up

Author: petk

cmake/Zend/CMakeLists.txt

@@ -298,8 +298,8 @@ target_link_libraries(zend PRIVATE PHP::configuration)
 target_include_directories(
   zend
   INTERFACE
-    ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_BINARY_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
 target_compile_definitions(
@@ -319,7 +319,7 @@ set_target_properties(
 )
 
 ################################################################################
-# Add transitive compile and link properties to PHP configuration interface.
+# Add usage requirements to PHP interface targets.
 ################################################################################
 
 # Cleaner COMPILE_ONLY generator expression is available in CMake >= 3.27.
@@ -340,11 +340,7 @@ else()
     php_configuration
     INTERFACE
       $<TARGET_PROPERTY:Zend::Zend,INTERFACE_INCLUDE_DIRECTORIES>
-  )
-  target_link_libraries(
-    php_configuration
-    INTERFACE
-      $<TARGET_PROPERTY:Zend::Zend,INTERFACE_LINK_LIBRARIES>
+      $<TARGET_PROPERTY:Zend::Zend,INTERFACE_SYSTEM_INCLUDE_DIRECTORIES>
   )
 endif()
 

cmake/Zend/cmake/MaxExecutionTimers.cmake

@@ -86,13 +86,6 @@ add_feature_info(
   "enhanced timeout and signal handling"
 )
 
-# Set the result variable also in the PARENT_SCOPE, to make it available for the
-# parent project PHP in its configuration headers. This module is included in
-# the Zend Engine which is added with add_subdirectory() in the PHP project.
-if(NOT PROJECT_IS_TOP_LEVEL)
-  set(ZEND_MAX_EXECUTION_TIMERS ${ZEND_MAX_EXECUTION_TIMERS} PARENT_SCOPE)
-endif()
-
 add_library(Zend::MaxExecutionTimers INTERFACE IMPORTED GLOBAL)
 if(libraryForTimerCreate)
   target_link_libraries(

cmake/cmake/ConfigureChecks.cmake

@@ -818,7 +818,7 @@ if(PHP_GCOV)
   endif()
 endif()
 
-# Check Valgrind.
+# Valgrind.
 if(PHP_VALGRIND)
   find_package(Valgrind)
   set_package_properties(
@@ -836,6 +836,82 @@ if(PHP_VALGRIND)
 endif()
 add_feature_info(
   "Valgrind"
-  PHP_VALGRIND
+  HAVE_VALGRIND
   "dynamic analysis"
 )
+
+# DTrace.
+if(PHP_DTRACE)
+  message(CHECK_START "Checking for DTrace support")
+
+  find_package(DTrace)
+  set_package_properties(
+    DTrace
+    PROPERTIES
+      TYPE REQUIRED
+      PURPOSE "Necessary to enable the DTrace support."
+  )
+
+  if(DTrace_FOUND)
+    dtrace_target(
+      php_dtrace
+      INPUT ${PHP_SOURCE_DIR}/Zend/zend_dtrace.d
+      HEADER ${PHP_BINARY_DIR}/Zend/zend_dtrace_gen.h
+      SOURCES
+        ${PHP_SOURCE_DIR}/main/main.c
+        ${PHP_SOURCE_DIR}/Zend/zend_API.c
+        ${PHP_SOURCE_DIR}/Zend/zend_dtrace.c
+        ${PHP_SOURCE_DIR}/Zend/zend_exceptions.c
+        ${PHP_SOURCE_DIR}/Zend/zend_execute.c
+        ${PHP_SOURCE_DIR}/Zend/zend.c
+      INCLUDES
+        $<TARGET_PROPERTY:PHP::configuration,INTERFACE_INCLUDE_DIRECTORIES>
+    )
+    target_link_libraries(php_configuration INTERFACE DTrace::DTrace)
+    target_link_libraries(php_sapi INTERFACE php_dtrace)
+
+    set(HAVE_DTRACE TRUE)
+
+    message(CHECK_PASS "yes")
+  else()
+    message(CHECK_FAIL "no")
+  endif()
+endif()
+add_feature_info(
+  "DTrace"
+  HAVE_DTRACE
+  "performance analysis and troubleshooting"
+)
+
+# Dmalloc.
+if(PHP_DMALLOC)
+  message(CHECK_START "Checking for Dmalloc support")
+
+  find_package(Dmalloc)
+  set_package_properties(
+    Dmalloc
+    PROPERTIES
+      TYPE REQUIRED
+      PURPOSE "Necessary to use Dmalloc memory debugger."
+  )
+
+  target_compile_definitions(
+    php_configuration
+    INTERFACE
+      $<$<COMPILE_LANGUAGE:ASM,C,CXX>:DMALLOC_FUNC_CHECK>
+  )
+
+  target_link_libraries(php_configuration INTERFACE Dmalloc::Dmalloc)
+
+  if(Dmalloc_FOUND)
+    message(CHECK_PASS "yes")
+    set(HAVE_DMALLOC TRUE)
+  else()
+    message(CHECK_FAIL "no")
+  endif()
+endif()
+add_feature_info(
+  "Dmalloc"
+  HAVE_DMALLOC
+  "memory debugging"
+)

cmake/ext/CMakeLists.txt

@@ -72,7 +72,7 @@ foreach(extension IN LISTS extensions)
 
   add_dependencies(php_${extension} Zend::Zend)
 
-  # Add transitive compile and link properties to PHP configuration interface.
+  # Add usage requirements to PHP interface targets.
   # 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$")

cmake/ext/standard/CMakeLists.txt

@@ -534,42 +534,26 @@ endblock()
 
 check_symbol_exists(chroot "unistd.h" HAVE_CHROOT)
 
-add_library(php_standard_functions_cli OBJECT)
 add_library(php_standard_functions OBJECT)
+add_library(php_standard_functions_cli OBJECT)
 
-target_sources(php_standard_functions_cli PRIVATE basic_functions.c dir.c)
 target_sources(php_standard_functions PRIVATE basic_functions.c dir.c)
+target_sources(php_standard_functions_cli PRIVATE basic_functions.c dir.c)
 
-target_include_directories(
-  php_standard_functions_cli
-  PRIVATE
-    $<TARGET_PROPERTY:php_standard,INCLUDE_DIRECTORIES>
-)
-target_include_directories(
+set_target_properties(
   php_standard_functions
-  PRIVATE
-    $<TARGET_PROPERTY:php_standard,INCLUDE_DIRECTORIES>
+  php_standard_functions_cli
+  PROPERTIES
+    INCLUDE_DIRECTORIES $<TARGET_PROPERTY:php_standard,INCLUDE_DIRECTORIES>
+    COMPILE_DEFINITIONS $<TARGET_PROPERTY:php_standard,COMPILE_DEFINITIONS>
+    LINK_LIBRARIES $<TARGET_PROPERTY:php_standard,LINK_LIBRARIES>
 )
 
 target_compile_definitions(
   php_standard_functions_cli
   PRIVATE
-    $<TARGET_PROPERTY:php_standard,COMPILE_DEFINITIONS>
     $<$<NOT:$<PLATFORM_ID:Windows>>:ENABLE_CHROOT_FUNC>
 )
-target_compile_definitions(
-  php_standard_functions
-  PRIVATE $<TARGET_PROPERTY:php_standard,COMPILE_DEFINITIONS>
-)
-
-target_link_libraries(
-  php_standard_functions_cli
-  PRIVATE $<TARGET_PROPERTY:php_standard,LINK_LIBRARIES>
-)
-target_link_libraries(
-  php_standard_functions
-  PRIVATE $<TARGET_PROPERTY:php_standard,LINK_LIBRARIES>
-)
 
 # ext/standard functions objects based on the SAPI type.
 target_sources(