Merge branch 'PHP-8.4'

petk · petk · commit a4f9b16946ae · 2024-09-27T00:49:11.000+02:00
diff --git a/cmake/TSRM/CMakeLists.txt b/cmake/TSRM/CMakeLists.txt
@@ -31,5 +31,5 @@ install(
   TARGETS php_tsrm
   ARCHIVE EXCLUDE_FROM_ALL
   FILE_SET HEADERS
-    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/TSRM
+    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PHP_INCLUDE_PREFIX}/TSRM
 )
diff --git a/cmake/Zend/CMakeLists.txt b/cmake/Zend/CMakeLists.txt
@@ -507,5 +507,5 @@ install(
   TARGETS zend
   ARCHIVE EXCLUDE_FROM_ALL
   FILE_SET HEADERS
-    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/Zend
+    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PHP_INCLUDE_PREFIX}/Zend
 )
diff --git a/cmake/cmake/Configuration.cmake b/cmake/cmake/Configuration.cmake
@@ -60,6 +60,17 @@ if(NOT PHP_LAYOUT STREQUAL "GNU")
   # TODO: DATAROOTDIR should be "php" instead of default "share".
 endif()
 
+set(
+  PHP_INCLUDE_PREFIX "php"
+  CACHE STRING
+  "The relative directory inside the CMAKE_INSTALL_INCLUDEDIR, where to install\
+  PHP headers. For example, 'php/${PHP_VERSION}' to specify version or other\
+  build-related characteristics and have multiple PHP versions installed.\
+  Absolute paths are threated as relative; set CMAKE_INSTALL_INCLUDEDIR if\
+  absolute path needs to be set."
+)
+mark_as_advanced(PHP_INCLUDE_PREFIX)
+
 set(
   PHP_CONFIG_FILE_SCAN_DIR ""
   CACHE PATH "The path where to scan for additional INI configuration files; By\
diff --git a/cmake/cmake/Platform.cmake b/cmake/cmake/Platform.cmake
@@ -24,10 +24,6 @@ include(PHP/SystemExtensions)
 target_link_libraries(php_configuration INTERFACE PHP::SystemExtensions)
 
 # Set installation directories.
-set(
-  CMAKE_INSTALL_INCLUDEDIR "include/php"
-  CACHE STRING "Include directory containing PHP header files (include/php)"
-)
 include(GNUInstallDirs)
 
 # Detect C standard library implementation.
diff --git a/cmake/cmake/modules/PHP/ConfigureFile.cmake b/cmake/cmake/modules/PHP/ConfigureFile.cmake
@@ -20,16 +20,13 @@ php_configure_file(
 
 * `VARIABLES`
 
-  Pairs of variable names and values.
+  Pairs of variable names and values. Variable values support generator
+  expressions.
 
   The `$<INSTALL_PREFIX>` generator expression can be used in variable values,
   which is replaced with installation prefix either set via the
   `CMAKE_INSTALL_PREFIX` variable at the configuration phase, or the `--prefix`
   option at the `cmake --install` phase.
-
-  The custom PHP specific `$<PHP_EXPAND:path>` generator expression can be used
-  in variable values. It is automatically replaced to `<install-prefix>/path`
-  if `path` is relative, or to just `path` if `path` is absolute.
 #]=============================================================================]
 
 include_guard(GLOBAL)
@@ -97,16 +94,6 @@ function(_php_configure_file_parse_variables)
 
     list(APPEND resultVariables ${var})
 
-    if(value MATCHES [[^\$<PHP_EXPAND:(.*)>.*]])
-      if(IS_ABSOLUTE "${CMAKE_MATCH_1}")
-        set(value "${CMAKE_MATCH_1}")
-      elseif(CMAKE_MATCH_1)
-        set(value "$<INSTALL_PREFIX>/${CMAKE_MATCH_1}")
-      else()
-        set(value "")
-      endif()
-    endif()
-
     # The resultValues are for the first configure_file().
     if(value MATCHES [[.*\$<INSTALL_PREFIX>.*]])
       string(
diff --git a/cmake/cmake/modules/PHP/Extensions.cmake b/cmake/cmake/modules/PHP/Extensions.cmake
@@ -661,7 +661,7 @@ function(_php_extensions_post_configure directory)
     LIBRARY
       DESTINATION ${PHP_EXTENSION_DIR}
     FILE_SET HEADERS
-      DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/ext/${extension}
+      DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PHP_INCLUDE_PREFIX}/ext/${extension}
   )
 
   # Check if extension is always enabled.
diff --git a/cmake/cmake/modules/PHP/PkgConfigGenerator.cmake b/cmake/cmake/modules/PHP/PkgConfigGenerator.cmake
@@ -45,10 +45,6 @@ template.
   which is replaced with installation prefix either set via the
   `CMAKE_INSTALL_PREFIX` variable at the configuration phase, or the `--prefix`
   option at the `cmake --install` phase.
-
-  The custom PHP specific `$<PHP_EXPAND:path>` generator expression can be used
-  in variable values. It is automatically replaced to `<install-prefix>/path`
-  if `path` is relative, or to just `path` if `path` is absolute.
 #]=============================================================================]
 
 include_guard(GLOBAL)
@@ -87,16 +83,6 @@ function(_pkgconfig_parse_variables variables)
 
     list(APPEND result_variables ${var})
 
-    if(value MATCHES [[^\$<PHP_EXPAND:(.*)>.*]])
-      if(IS_ABSOLUTE "${CMAKE_MATCH_1}")
-        set(value "${CMAKE_MATCH_1}")
-      elseif(CMAKE_MATCH_1)
-        set(value "$<INSTALL_PREFIX>/${CMAKE_MATCH_1}")
-      else()
-        set(value "")
-      endif()
-    endif()
-
     # The result_values are for the install(CODE) and generator expression
     # $<INSTALL_PREFIX> works since CMake 3.27, for earlier versions the escaped
     # variable CMAKE_INSTALL_PREFIX can be used.
diff --git a/cmake/ext/skeleton/CMakeLists.txt.in b/cmake/ext/skeleton/CMakeLists.txt.in
@@ -93,5 +93,5 @@ install(
   TARGETS php_%EXTNAME%
   ARCHIVE EXCLUDE_FROM_ALL
   FILE_SET HEADERS
-    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/ext/%EXTNAME%
+    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PHP_INCLUDE_PREFIX}/ext/%EXTNAME%
 )
diff --git a/cmake/main/CMakeLists.txt b/cmake/main/CMakeLists.txt
@@ -373,5 +373,5 @@ install(
   TARGETS php_main
   ARCHIVE EXCLUDE_FROM_ALL
   FILE_SET HEADERS
-    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/main
+    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PHP_INCLUDE_PREFIX}/main
 )
diff --git a/cmake/sapi/cli/CMakeLists.txt b/cmake/sapi/cli/CMakeLists.txt
@@ -146,7 +146,7 @@ install(
   RUNTIME
     DESTINATION ${CMAKE_INSTALL_BINDIR}
   FILE_SET HEADERS
-    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sapi/cli
+    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PHP_INCLUDE_PREFIX}/sapi/cli
 )
 
 install(
diff --git a/cmake/sapi/embed/CMakeLists.txt b/cmake/sapi/embed/CMakeLists.txt
@@ -50,13 +50,14 @@ pkgconfig_generate_pc(
   VARIABLES
     prefix "$<INSTALL_PREFIX>"
     exec_prefix "$<INSTALL_PREFIX>"
-    includedir "$<PHP_EXPAND:${CMAKE_INSTALL_INCLUDEDIR}>"
-    libdir "$<PHP_EXPAND:${CMAKE_INSTALL_LIBDIR}>"
+    includedir "$<PATH:ABSOLUTE_PATH,NORMALIZE,${CMAKE_INSTALL_INCLUDEDIR},$<INSTALL_PREFIX>>"
+    php_include_prefix "${PHP_INCLUDE_PREFIX}"
+    libdir "$<PATH:ABSOLUTE_PATH,NORMALIZE,${CMAKE_INSTALL_LIBDIR},$<INSTALL_PREFIX>>"
     PHP_VERSION "${PHP_VERSION}"
     PHP_VERSION_ID "${PHP_VERSION_ID}"
-    PHP_EXTENSION_DIR "$<PHP_EXPAND:${PHP_EXTENSION_DIR}>"
-    PHP_CONFIG_FILE_SCAN_DIR "$<PHP_EXPAND:${PHP_FULL_CONFIG_FILE_SCAN_DIR}>"
-    PHP_CONFIG_FILE_PATH "$<PHP_EXPAND:${PHP_CONFIG_FILE_PATH}>"
+    PHP_EXTENSION_DIR "$<PATH:ABSOLUTE_PATH,NORMALIZE,${PHP_EXTENSION_DIR},$<INSTALL_PREFIX>>"
+    PHP_CONFIG_FILE_SCAN_DIR "$<PATH:ABSOLUTE_PATH,NORMALIZE,${PHP_FULL_CONFIG_FILE_SCAN_DIR},$<INSTALL_PREFIX>>"
+    PHP_CONFIG_FILE_PATH "$<PATH:ABSOLUTE_PATH,NORMALIZE,${PHP_CONFIG_FILE_PATH},$<INSTALL_PREFIX>>"
     PHP_DEBUG "$<IF:$<CONFIG:Debug,DebugAssertions>,yes,no>"
     PHP_THREAD_SAFETY "$<IF:$<BOOL:$<TARGET_PROPERTY:php_configuration,PHP_THREAD_SAFETY>>,yes,no>"
 )
diff --git a/cmake/sapi/embed/php-embed.pc.in b/cmake/sapi/embed/php-embed.pc.in
@@ -12,6 +12,7 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 includedir=@includedir@
+php_include_prefix=@php_include_prefix@
 libdir=@libdir@
 # The extension_dir PHP INI directive absolute path.
 extensiondir=@PHP_EXTENSION_DIR@
@@ -32,6 +33,6 @@ URL: https://www.php.net
 License: PHP
 Version: @PHP_VERSION@
 Cflags.private: @PHP_CFLAGS_PRIVATE@
-Cflags: -I${includedir} -I${includedir}/main -I${includedir}/TSRM -I${includedir}/Zend -I${includedir}/ext
+Cflags: -I${includedir}/${php_include_prefix} -I${includedir}/${php_include_prefix}/main -I${includedir}/${php_include_prefix}/TSRM -I${includedir}/${php_include_prefix}/Zend -I${includedir}/${php_include_prefix}/ext
 Libs.private: @PHP_LIBS_PRIVATE@
 Libs: -L${libdir} -lphp
diff --git a/cmake/sapi/fpm/CMakeLists.txt b/cmake/sapi/fpm/CMakeLists.txt
@@ -391,8 +391,8 @@ php_configure_file(
   php-fpm.8.in
   php-fpm.8
   VARIABLES
-    php_fpm_localstatedir "$<PHP_EXPAND:${CMAKE_INSTALL_LOCALSTATEDIR}>"
-    php_fpm_sysconfdir "$<PHP_EXPAND:${CMAKE_INSTALL_SYSCONFDIR}>"
+    php_fpm_localstatedir "$<PATH:ABSOLUTE_PATH,NORMALIZE,${CMAKE_INSTALL_LOCALSTATEDIR},$<INSTALL_PREFIX>>"
+    php_fpm_sysconfdir "$<PATH:ABSOLUTE_PATH,NORMALIZE,${CMAKE_INSTALL_SYSCONFDIR},$<INSTALL_PREFIX>>"
     php_fpm_prefix "$<INSTALL_PREFIX>"
     PHP_VERSION "${PHP_VERSION}"
 )
@@ -407,8 +407,8 @@ php_configure_file(
   php-fpm.conf
   VARIABLES
     prefix "$<INSTALL_PREFIX>"
-    EXPANDED_LOCALSTATEDIR "$<PHP_EXPAND:${CMAKE_INSTALL_LOCALSTATEDIR}>"
-    php_fpm_sysconfdir "$<PHP_EXPAND:${CMAKE_INSTALL_SYSCONFDIR}>"
+    EXPANDED_LOCALSTATEDIR "$<PATH:ABSOLUTE_PATH,NORMALIZE,${CMAKE_INSTALL_LOCALSTATEDIR},$<INSTALL_PREFIX>>"
+    php_fpm_sysconfdir "$<PATH:ABSOLUTE_PATH,NORMALIZE,${CMAKE_INSTALL_SYSCONFDIR},$<INSTALL_PREFIX>>"
 )
 
 php_configure_file(
@@ -419,7 +419,7 @@ php_configure_file(
     php_fpm_prefix "$<INSTALL_PREFIX>"
     php_fpm_user "${SAPI_FPM_USER}"
     php_fpm_group "${SAPI_FPM_GROUP}"
-    EXPANDED_DATADIR "$<PHP_EXPAND:${CMAKE_INSTALL_DATADIR}>"
+    EXPANDED_DATADIR "$<PATH:ABSOLUTE_PATH,NORMALIZE,${CMAKE_INSTALL_DATADIR},$<INSTALL_PREFIX>>"
 )
 
 php_configure_file(
@@ -428,19 +428,19 @@ php_configure_file(
   VARIABLES
     prefix "$<INSTALL_PREFIX>"
     exec_prefix "$<INSTALL_PREFIX>"
-    sbindir "$<PHP_EXPAND:${CMAKE_INSTALL_SBINDIR}>"
-    sysconfdir "$<PHP_EXPAND:${CMAKE_INSTALL_SYSCONFDIR}>"
-    localstatedir "$<PHP_EXPAND:${CMAKE_INSTALL_LOCALSTATEDIR}>"
+    sbindir "$<PATH:ABSOLUTE_PATH,NORMALIZE,${CMAKE_INSTALL_SBINDIR},$<INSTALL_PREFIX>>"
+    sysconfdir "$<PATH:ABSOLUTE_PATH,NORMALIZE,${CMAKE_INSTALL_SYSCONFDIR},$<INSTALL_PREFIX>>"
+    localstatedir "$<PATH:ABSOLUTE_PATH,NORMALIZE,${CMAKE_INSTALL_LOCALSTATEDIR},$<INSTALL_PREFIX>>"
 )
 
 php_configure_file(
   php-fpm.service.in
   php-fpm.service
   VARIABLES
     php_fpm_systemd "${PHP_FPM_SYSTEMD}"
-    EXPANDED_LOCALSTATEDIR "$<PHP_EXPAND:${CMAKE_INSTALL_LOCALSTATEDIR}>"
-    EXPANDED_SBINDIR "$<PHP_EXPAND:${CMAKE_INSTALL_SBINDIR}>"
-    EXPANDED_SYSCONFDIR "$<PHP_EXPAND:${CMAKE_INSTALL_SYSCONFDIR}>"
+    EXPANDED_LOCALSTATEDIR "$<PATH:ABSOLUTE_PATH,NORMALIZE,${CMAKE_INSTALL_LOCALSTATEDIR},$<INSTALL_PREFIX>>"
+    EXPANDED_SBINDIR "$<PATH:ABSOLUTE_PATH,NORMALIZE,${CMAKE_INSTALL_SBINDIR},$<INSTALL_PREFIX>>"
+    EXPANDED_SYSCONFDIR "$<PATH:ABSOLUTE_PATH,NORMALIZE,${CMAKE_INSTALL_SYSCONFDIR},$<INSTALL_PREFIX>>"
 )
 
 # TODO: Add program file prefix and suffix.
diff --git a/cmake/scripts/CMakeLists.txt b/cmake/scripts/CMakeLists.txt
@@ -48,34 +48,51 @@ block()
 
   # The php-config script.
   message(STATUS "Creating scripts/php-config")
+
+  # Replace the upstream php-config script hardcoded php include directory to a
+  # template placeholder.
+  file(READ "${CMAKE_CURRENT_SOURCE_DIR}/php-config.in" content)
+  string(
+    REPLACE
+    [[include_dir="@includedir@/php"]]
+    [[include_dir="@includedir@"]]
+    content
+    "${content}"
+  )
+  file(
+    WRITE
+    "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/php-config.cmake.in"
+    "${content}"
+  )
+
   php_configure_file(
-    php-config.in
+    ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/php-config.cmake.in
     php-config
     VARIABLES
       SED "${SED}"
       prefix "$<INSTALL_PREFIX>"
-      datarootdir "$<PHP_EXPAND:${CMAKE_INSTALL_DATAROOTDIR}>"
+      datarootdir "$<PATH:ABSOLUTE_PATH,NORMALIZE,${CMAKE_INSTALL_DATAROOTDIR},$<INSTALL_PREFIX>>"
       exec_prefix "$<INSTALL_PREFIX>"
       PHP_VERSION "${PHP_VERSION}"
       PHP_VERSION_ID "${PHP_VERSION_ID}"
-      includedir "$<PHP_EXPAND:${CMAKE_INSTALL_INCLUDEDIR}>"
+      includedir "$<PATH:ABSOLUTE_PATH,NORMALIZE,${CMAKE_INSTALL_INCLUDEDIR}/${PHP_INCLUDE_PREFIX},$<INSTALL_PREFIX>>"
       # TODO:
       PHP_LDFLAGS ""
       # TODO:
       EXTRA_LIBS ""
-      EXTENSION_DIR "$<PHP_EXPAND:${PHP_EXTENSION_DIR}>"
-      mandir "$<PHP_EXPAND:${CMAKE_INSTALL_MANDIR}>"
+      EXTENSION_DIR "$<PATH:ABSOLUTE_PATH,NORMALIZE,${PHP_EXTENSION_DIR},$<INSTALL_PREFIX>>"
+      mandir "$<PATH:ABSOLUTE_PATH,NORMALIZE,${CMAKE_INSTALL_MANDIR},$<INSTALL_PREFIX>>"
       program_prefix "${PHP_PROGRAM_PREFIX}"
       program_suffix "${PHP_PROGRAM_SUFFIX}"
       EXEEXT "${CMAKE_EXECUTABLE_SUFFIX}"
       # TODO:
       CONFIGURE_OPTIONS ""
       # TODO:
       PHP_INSTALLED_SAPIS ""
-      EXPANDED_PHP_CONFIG_FILE_SCAN_DIR "$<PHP_EXPAND:${PHP_CONFIG_FILE_SCAN_DIR}>"
-      EXPANDED_PHP_CONFIG_FILE_PATH "$<PHP_EXPAND:${PHP_CONFIG_FILE_PATH}>"
-      bindir "$<PHP_EXPAND:${CMAKE_INSTALL_BINDIR}>"
-      orig_libdir "$<PHP_EXPAND:${CMAKE_INSTALL_LIBDIR}>"
+      EXPANDED_PHP_CONFIG_FILE_SCAN_DIR "$<PATH:ABSOLUTE_PATH,NORMALIZE,${PHP_CONFIG_FILE_SCAN_DIR},$<INSTALL_PREFIX>>"
+      EXPANDED_PHP_CONFIG_FILE_PATH "$<PATH:ABSOLUTE_PATH,NORMALIZE,${PHP_CONFIG_FILE_PATH},$<INSTALL_PREFIX>>"
+      bindir "$<PATH:ABSOLUTE_PATH,NORMALIZE,${CMAKE_INSTALL_BINDIR},$<INSTALL_PREFIX>>"
+      orig_libdir "$<PATH:ABSOLUTE_PATH,NORMALIZE,${CMAKE_INSTALL_LIBDIR},$<INSTALL_PREFIX>>"
       SAPI_LIBNAME_SHARED "libphp.so"
       SAPI_LIBNAME_STATIC "libphp.a"
       PHP_EMBED_TYPE "${PHP_EMBED_TYPE}"
@@ -90,15 +107,32 @@ block()
 
   # The phpize script.
   message(STATUS "Creating scripts/phpize")
+
+  # Replace the upstream phpize script hardcoded php include directory to a
+  # template placeholder.
+  file(READ "${CMAKE_CURRENT_SOURCE_DIR}/phpize.in" content)
+  string(
+    REPLACE
+    [[includedir="`eval echo @includedir@`/php"]]
+    [[includedir="@includedir@"]]
+    content
+    "${content}"
+  )
+  file(
+    WRITE
+    "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/phpize.cmake.in"
+    "${content}"
+  )
+
   php_configure_file(
-    phpize.in
+    ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/phpize.cmake.in
     phpize
     VARIABLES
       prefix "$<INSTALL_PREFIX>"
-      datarootdir "$<PHP_EXPAND:${CMAKE_INSTALL_DATAROOTDIR}>"
+      datarootdir "$<PATH:ABSOLUTE_PATH,NORMALIZE,${CMAKE_INSTALL_DATAROOTDIR},$<INSTALL_PREFIX>>"
       exec_prefix "$<INSTALL_PREFIX>"
-      libdir "$<PHP_EXPAND:${CMAKE_INSTALL_LIBDIR}>"
-      includedir "$<PHP_EXPAND:${CMAKE_INSTALL_INCLUDEDIR}>"
+      libdir "$<PATH:ABSOLUTE_PATH,NORMALIZE,${CMAKE_INSTALL_LIBDIR},$<INSTALL_PREFIX>>"
+      includedir "$<PATH:ABSOLUTE_PATH,NORMALIZE,${CMAKE_INSTALL_INCLUDEDIR}/${PHP_INCLUDE_PREFIX},$<INSTALL_PREFIX>>"
       SED "${SED}"
   )
 
@@ -119,13 +153,14 @@ pkgconfig_generate_pc(
   VARIABLES
     prefix "$<INSTALL_PREFIX>"
     exec_prefix "$<INSTALL_PREFIX>"
-    includedir "$<PHP_EXPAND:${CMAKE_INSTALL_INCLUDEDIR}>"
-    libdir "$<PHP_EXPAND:${CMAKE_INSTALL_LIBDIR}>"
+    includedir "$<PATH:ABSOLUTE_PATH,NORMALIZE,${CMAKE_INSTALL_INCLUDEDIR},$<INSTALL_PREFIX>>"
+    php_include_prefix "${PHP_INCLUDE_PREFIX}"
+    libdir "$<PATH:ABSOLUTE_PATH,NORMALIZE,${CMAKE_INSTALL_LIBDIR},$<INSTALL_PREFIX>>"
     PHP_VERSION "${PHP_VERSION}"
     PHP_VERSION_ID "${PHP_VERSION_ID}"
-    PHP_EXTENSION_DIR "$<PHP_EXPAND:${PHP_EXTENSION_DIR}>"
-    PHP_CONFIG_FILE_SCAN_DIR "$<PHP_EXPAND:${PHP_CONFIG_FILE_SCAN_DIR}>"
-    PHP_CONFIG_FILE_PATH "$<PHP_EXPAND:${PHP_CONFIG_FILE_PATH}>"
+    PHP_EXTENSION_DIR "$<PATH:ABSOLUTE_PATH,NORMALIZE,${PHP_EXTENSION_DIR},$<INSTALL_PREFIX>>"
+    PHP_CONFIG_FILE_SCAN_DIR "$<PATH:ABSOLUTE_PATH,NORMALIZE,${PHP_CONFIG_FILE_SCAN_DIR},$<INSTALL_PREFIX>>"
+    PHP_CONFIG_FILE_PATH "$<PATH:ABSOLUTE_PATH,NORMALIZE,${PHP_CONFIG_FILE_PATH},$<INSTALL_PREFIX>>"
     PHP_DEBUG "$<IF:$<CONFIG:Debug,DebugAssertions>,yes,no>"
     PHP_THREAD_SAFETY "$<IF:$<BOOL:$<TARGET_PROPERTY:php_configuration,PHP_THREAD_SAFETY>>,yes,no>"
 )
diff --git a/cmake/scripts/php.pc.in b/cmake/scripts/php.pc.in
@@ -12,6 +12,7 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 includedir=@includedir@
+php_include_prefix=@php_include_prefix@
 libdir=@libdir@
 # The extension_dir PHP INI directive absolute path.
 extensiondir=@PHP_EXTENSION_DIR@
@@ -32,6 +33,6 @@ URL: https://www.php.net
 License: PHP
 Version: @PHP_VERSION@
 Cflags.private: @PHP_CFLAGS_PRIVATE@
-Cflags: -I${includedir} -I${includedir}/main -I${includedir}/TSRM -I${includedir}/Zend -I${includedir}/ext
+Cflags: -I${includedir}/${php_include_prefix} -I${includedir}/${php_include_prefix}/main -I${includedir}/${php_include_prefix}/TSRM -I${includedir}/${php_include_prefix}/Zend -I${includedir}/${php_include_prefix}/ext
 Libs.private: @PHP_LIBS_PRIVATE@
 Libs:
diff --git a/cmake/win32/CMakeLists.txt b/cmake/win32/CMakeLists.txt
@@ -131,5 +131,5 @@ install(
   TARGETS php_win32
   ARCHIVE EXCLUDE_FROM_ALL
   FILE_SET HEADERS
-    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/win32
+    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PHP_INCLUDE_PREFIX}/win32
 )

Original file line number	Diff line number	Diff line change
`@@ -31,5 +31,5 @@ install(`
`31`	`31`	`TARGETS php_tsrm`
`32`	`32`	`ARCHIVE EXCLUDE_FROM_ALL`
`33`	`33`	`FILE_SET HEADERS`
`34`		`- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/TSRM`
	`34`	`+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PHP_INCLUDE_PREFIX}/TSRM`
`35`	`35`	`)`
Original file line number	Diff line number	Diff line change
`@@ -507,5 +507,5 @@ install(`
`507`	`507`	`TARGETS zend`
`508`	`508`	`ARCHIVE EXCLUDE_FROM_ALL`
`509`	`509`	`FILE_SET HEADERS`
`510`		`- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/Zend`
	`510`	`+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PHP_INCLUDE_PREFIX}/Zend`
`511`	`511`	`)`
Original file line number	Diff line number	Diff line change
`@@ -661,7 +661,7 @@ function(_php_extensions_post_configure directory)`
`661`	`661`	`LIBRARY`
`662`	`662`	`DESTINATION ${PHP_EXTENSION_DIR}`
`663`	`663`	`FILE_SET HEADERS`
`664`		`- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/ext/${extension}`
	`664`	`+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PHP_INCLUDE_PREFIX}/ext/${extension}`
`665`	`665`	`)`
`666`	`666`
`667`	`667`	`# Check if extension is always enabled.`
Original file line number	Diff line number	Diff line change
`@@ -93,5 +93,5 @@ install(`
`93`	`93`	`TARGETS php_%EXTNAME%`
`94`	`94`	`ARCHIVE EXCLUDE_FROM_ALL`
`95`	`95`	`FILE_SET HEADERS`
`96`		`- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/ext/%EXTNAME%`
	`96`	`+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PHP_INCLUDE_PREFIX}/ext/%EXTNAME%`
`97`	`97`	`)`
Original file line number	Diff line number	Diff line change
`@@ -373,5 +373,5 @@ install(`
`373`	`373`	`TARGETS php_main`
`374`	`374`	`ARCHIVE EXCLUDE_FROM_ALL`
`375`	`375`	`FILE_SET HEADERS`
`376`		`- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/main`
	`376`	`+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PHP_INCLUDE_PREFIX}/main`
`377`	`377`	`)`
Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@ install(`
`146`	`146`	`RUNTIME`
`147`	`147`	`DESTINATION ${CMAKE_INSTALL_BINDIR}`
`148`	`148`	`FILE_SET HEADERS`
`149`		`- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sapi/cli`
	`149`	`+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PHP_INCLUDE_PREFIX}/sapi/cli`
`150`	`150`	`)`
`151`	`151`
`152`	`152`	`install(`