Merge branch 'PHP-8.5'

Author: petk

.github/workflows/ci.yaml

@@ -126,6 +126,18 @@ jobs:
       - name: Install PHP
         run: cmake --install php-build/all-enabled
 
+      - name: Setup shared standalone extension
+        run: |
+          php php-src/ext/ext_skel.php --ext phantom
+          cd php-src/ext/phantom
+          cmake \
+            -B cmake-build \
+            -DPHP_EXT_PHANTOM=ON \
+            -DPHP_EXT_PHANTOM_SHARED=ON
+          cmake --build cmake-build -j
+          cmake --install cmake-build
+          php -d extension=phantom -m | grep phantom
+
   windows:
     runs-on: windows-latest
     name: Windows

cmake/CMakeLists.txt

@@ -168,13 +168,114 @@ if(NOT PHP_HOST_FOUND)
   include(cmake/Rebuild.cmake)
 endif()
 
+################################################################################
+# Configure PHP installation.
+################################################################################
+
+include(CMakePackageConfigHelpers)
+
+write_basic_package_version_file(
+  PHPConfigVersion.cmake
+  VERSION "${PHP_VERSION}" # Set explicitly so also PHP_VERSION_LABEL is added.
+  COMPATIBILITY AnyNewerVersion
+)
+
+configure_package_config_file(
+  cmake/PHPConfig.cmake.in
+  PHPConfig.cmake
+  INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/PHP
+  PATH_VARS
+    PHP_EXTENSION_DIR
+    PHP_INSTALL_INCLUDEDIR
+)
+
+add_library(php_extension INTERFACE)
+add_library(PHP::Extension ALIAS php_extension)
+set_target_properties(php_extension PROPERTIES EXPORT_NAME Extension)
+target_include_directories(
+  php_extension
+  INTERFACE
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/main>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/TSRM>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/Zend>
+    $<INSTALL_INTERFACE:${PHP_INSTALL_INCLUDEDIR}>
+    $<INSTALL_INTERFACE:${PHP_INSTALL_INCLUDEDIR}/main>
+    $<INSTALL_INTERFACE:${PHP_INSTALL_INCLUDEDIR}/TSRM>
+    $<INSTALL_INTERFACE:${PHP_INSTALL_INCLUDEDIR}/Zend>
+)
+target_compile_definitions(
+  php_extension
+  INTERFACE
+  $<INSTALL_INTERFACE:HAVE_CONFIG_H;ZEND_COMPILE_DL_EXT>
+  $<BUILD_INTERFACE:$<$<IN_LIST:$<TARGET_PROPERTY:TYPE>,MODULE_LIBRARY;SHARED_LIBRARY>:ZEND_COMPILE_DL_EXT>>
+)
+
+install(
+  TARGETS php_extension
+  EXPORT php_development_export
+)
+
+install(
+  EXPORT php_development_export
+  NAMESPACE PHP::
+  FILE PHPDevelopmentTargets.cmake
+  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/PHP/targets
+  COMPONENT php-development
+)
+
+install(
+  FILES
+    ${CMAKE_CURRENT_BINARY_DIR}/PHPConfig.cmake
+    ${CMAKE_CURRENT_BINARY_DIR}/PHPConfigVersion.cmake
+  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/PHP
+  COMPONENT php-development
+)
+
+install(
+  FILES
+    ${CMAKE_CURRENT_SOURCE_DIR}/CODING_STANDARDS.md
+    ${CMAKE_CURRENT_SOURCE_DIR}/EXTENSIONS
+    ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE
+    ${CMAKE_CURRENT_SOURCE_DIR}/NEWS
+    ${CMAKE_CURRENT_SOURCE_DIR}/README.md
+    ${CMAKE_CURRENT_SOURCE_DIR}/README.REDIST.BINS
+    ${CMAKE_CURRENT_SOURCE_DIR}/UPGRADING
+    ${CMAKE_CURRENT_SOURCE_DIR}/UPGRADING.INTERNALS
+  TYPE DOC
+  COMPONENT php-doc
+)
+
+install(
+  DIRECTORY cmake/modules
+  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/PHP
+  COMPONENT php-development
+  PATTERN "FindPHP.cmake" EXCLUDE
+)
+
+set(CMAKE_EXPERIMENTAL_EXPORT_PACKAGE_INFO "b80be207-778e-46ba-8080-b23bba22639e")
+
+install(
+  PACKAGE_INFO PHP
+  EXPORT php_development_export
+)
+
+################################################################################
 # Enable testing and configure test settings.
+################################################################################
+
 include(cmake/Testing.cmake)
 
+################################################################################
 # Enable and configure CPack module.
+################################################################################
+
 include(cmake/CPack.cmake)
 
+################################################################################
 # Print build configuration summary.
+################################################################################
+
 include(cmake/Summary.cmake)
 
 message(

cmake/Zend/CMakeLists.txt

@@ -386,7 +386,7 @@ target_include_directories(
   php_zend
   INTERFACE
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../TSRM>
-    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/${PHP_INCLUDE_PREFIX}/TSRM>
+    $<INSTALL_INTERFACE:${PHP_INSTALL_INCLUDEDIR}/TSRM>
 )
 
 target_compile_definitions(
@@ -397,7 +397,7 @@ target_compile_definitions(
 install(
   TARGETS php_zend
   FILE_SET tsrm
-    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PHP_INCLUDE_PREFIX}/TSRM
+    DESTINATION ${PHP_INSTALL_INCLUDEDIR}/TSRM
     COMPONENT php-development
 )
 
@@ -580,9 +580,9 @@ install(
   TARGETS php_zend
   ARCHIVE EXCLUDE_FROM_ALL
   FILE_SET HEADERS
-    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PHP_INCLUDE_PREFIX}/Zend
+    DESTINATION ${PHP_INSTALL_INCLUDEDIR}/Zend
     COMPONENT php-development
   FILE_SET generated
-    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PHP_INCLUDE_PREFIX}/Zend
+    DESTINATION ${PHP_INSTALL_INCLUDEDIR}/Zend
     COMPONENT php-development
 )

cmake/cmake/Configuration.cmake

@@ -84,6 +84,7 @@ set(
   VALUE "php"
 )
 mark_as_advanced(PHP_INCLUDE_PREFIX)
+set(PHP_INSTALL_INCLUDEDIR ${CMAKE_INSTALL_INCLUDEDIR}/${PHP_INCLUDE_PREFIX})
 
 set(
   CACHE{PHP_CONFIG_FILE_SCAN_DIR}

cmake/cmake/Extensions.cmake

@@ -393,50 +393,12 @@ function(php_extensions_postconfigure extension)
     endif()
   endforeach()
 
-  if(NOT TARGET PHP::ext::${extension})
-    add_library(PHP::ext::${extension} ALIAS php_ext_${extension})
-  endif()
-
-  # Set target output filename to "<extension>".
-  get_target_property(output php_ext_${extension} OUTPUT_NAME)
-  if(NOT output)
-    set_property(TARGET php_ext_${extension} PROPERTY OUTPUT_NAME ${extension})
-  endif()
-
-  # Specify extension's default installation rules.
-  get_target_property(sets php_ext_${extension} INTERFACE_HEADER_SETS)
-  set(file_sets "")
-  foreach(set IN LISTS sets)
-    list(
-      APPEND
-      file_sets
-      FILE_SET
-      ${set}
-      DESTINATION
-      ${CMAKE_INSTALL_INCLUDEDIR}/${PHP_INCLUDE_PREFIX}/ext/${extension}
-      COMPONENT php-development
-    )
-  endforeach()
-  install(
-    TARGETS php_ext_${extension}
-    ARCHIVE EXCLUDE_FROM_ALL
-    RUNTIME
-      DESTINATION ${PHP_EXTENSION_DIR}
-      COMPONENT php
-    LIBRARY
-      DESTINATION ${PHP_EXTENSION_DIR}
-      COMPONENT php
-    ${file_sets}
-  )
-
   # Configure shared extension.
   get_target_property(type php_ext_${extension} TYPE)
   if(NOT type MATCHES "^(MODULE|SHARED)_LIBRARY$")
     return()
   endif()
 
-  target_compile_definitions(php_ext_${extension} PRIVATE ZEND_COMPILE_DL_EXT)
-
   # Set build-phase location for shared extensions.
   get_target_property(location php_ext_${extension} LIBRARY_OUTPUT_DIRECTORY)
   if(NOT location)
@@ -456,48 +418,6 @@ function(php_extensions_postconfigure extension)
   endif()
 endfunction()
 
-# Prepend COMPILE_DL_<EXTENSION> macros to extensions configuration headers and
-# define them for shared extensions.
-function(php_extensions_configure_headers)
-  get_property(extensions GLOBAL PROPERTY PHP_EXTENSIONS)
-  foreach(extension IN LISTS extensions)
-    if(NOT TARGET php_ext_${extension})
-      continue()
-    endif()
-
-    string(TOUPPER "COMPILE_DL_${extension}" macro)
-
-    get_target_property(type php_ext_${extension} TYPE)
-    if(type MATCHES "^(MODULE|SHARED)_LIBRARY$")
-      set(${macro} TRUE)
-    else()
-      set(${macro} FALSE)
-    endif()
-
-    # Prepare config.h template.
-    string(
-      JOIN
-      ""
-      template
-      "/* Define to 1 if the PHP extension '@extension@' is built as a dynamic "
-      "module. */\n"
-      "#cmakedefine ${macro} 1\n"
-    )
-
-    get_target_property(binary_dir php_ext_${extension} BINARY_DIR)
-    set(current "")
-    if(EXISTS ${binary_dir}/config.h)
-      file(READ ${binary_dir}/config.h current)
-    endif()
-
-    # Finalize extension's config.h header file.
-    if(NOT current MATCHES "(#undef|#define) ${macro}")
-      string(STRIP "${template}\n${current}" config)
-      file(CONFIGURE OUTPUT ${binary_dir}/config.h CONTENT "${config}\n")
-    endif()
-  endforeach()
-endfunction()
-
 # Validate extensions and their dependencies defined via add_dependencies().
 function(_php_extensions_validate)
   get_directory_property(extensions SUBDIRECTORIES)