Merge branch 'PHP-8.3' into PHP-8.4

Author: petk

cmake/cmake/CMakeDefaults.cmake

@@ -10,9 +10,6 @@ include_guard(GLOBAL)
 # Add paths where include() and find_package() look for modules.
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/modules)
 
-# Automatically include current source or build tree for the current target.
-set(CMAKE_INCLUDE_CURRENT_DIR ON)
-
 # Put the source or build tree include directories before other includes.
 set(CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE ON)
 

cmake/ext/fileinfo/CMakeLists.txt

@@ -113,6 +113,8 @@ target_compile_definitions(
     HAVE_INTTYPES_H=1
 )
 
+target_include_directories(php_ext_fileinfo PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
+
 set_property(
   SOURCE libmagic/apprentice.c
   APPEND

cmake/ext/intl/CMakeLists.txt

@@ -166,6 +166,8 @@ target_sources(
     uchar/uchar.stub.php
 )
 
+target_include_directories(php_ext_intl PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
+
 php_check_compiler_flag(C -Wno-write-strings PHP_HAS_WNO_WRITE_STRINGS_C)
 if(PHP_HAS_WNO_WRITE_STRINGS_C)
   target_compile_options(

cmake/ext/opcache/CMakeLists.txt

@@ -153,6 +153,13 @@ if(PHP_EXT_OPCACHE_JIT)
   endif()
 endif()
 
+target_include_directories(
+  php_ext_opcache
+  PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_CURRENT_BINARY_DIR}
+)
+
 if(PHP_EXT_OPCACHE_JIT)
   # Find out which ABI to use.
   if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(x86_64|amd64|AMD64|ARM64)$")

cmake/sapi/fpm/CMakeLists.txt

@@ -225,6 +225,7 @@ target_sources(
 target_include_directories(
   php_sapi_fpm
   PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}/fpm
 )
 

cmake/win32/CMakeLists.txt

@@ -65,6 +65,7 @@ target_sources(
         ${CMAKE_CURRENT_BINARY_DIR}/wsyslog.h
 )
 
+target_include_directories(php_windows PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
 target_link_libraries(php_windows PRIVATE PHP::config)
 
 ################################################################################