Fix FILE_SET usage

When same header set (HEADERS) has base directory inside the other it
doesn't work. So a completely separate FILE_SET with name must be
created instead.

Author: petk

cmake/Zend/CMakeLists.txt

@@ -180,6 +180,15 @@ target_sources(
   PUBLIC
     FILE_SET HEADERS
       FILES
+        Optimizer/zend_call_graph.h
+        Optimizer/zend_cfg.h
+        Optimizer/zend_dfg.h
+        Optimizer/zend_dump.h
+        Optimizer/zend_func_info.h
+        Optimizer/zend_inference.h
+        Optimizer/zend_optimizer.h
+        Optimizer/zend_ssa.h
+        Optimizer/zend_worklist.h
         zend_alloc_sizes.h
         zend_alloc.h
         zend_API.h
@@ -276,18 +285,9 @@ target_sources(
         zend_weakrefs_arginfo.h
         zend_weakrefs.h
         zend.h
-        Optimizer/zend_call_graph.h
-        Optimizer/zend_cfg.h
-        Optimizer/zend_dfg.h
-        Optimizer/zend_dump.h
-        Optimizer/zend_func_info.h
-        Optimizer/zend_inference.h
-        Optimizer/zend_optimizer.h
-        Optimizer/zend_ssa.h
-        Optimizer/zend_worklist.h
-  # A separate file set so binary dir can also be created within a source dir.
   PUBLIC
-    FILE_SET HEADERS
+    FILE_SET generated
+      TYPE HEADERS
       BASE_DIRS ${CMAKE_CURRENT_BINARY_DIR}
       FILES
         $<$<NOT:$<PLATFORM_ID:Windows>>:${CMAKE_CURRENT_BINARY_DIR}/zend_config.h>
@@ -686,4 +686,6 @@ install(
   ARCHIVE EXCLUDE_FROM_ALL
   FILE_SET HEADERS
     DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PHP_INCLUDE_PREFIX}/Zend
+  FILE_SET generated
+    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PHP_INCLUDE_PREFIX}/Zend
 )

cmake/cmake/modules/PHP/Extensions.cmake

@@ -419,16 +419,27 @@ function(php_extensions_postconfigure extension)
     set_property(TARGET php_${extension} PROPERTY OUTPUT_NAME ${extension})
   endif()
 
-  # Add extension's default installation instructions.
+  # Specify extension's default installation rules.
+  get_target_property(sets php_${extension} INTERFACE_HEADER_SETS)
+  set(fileSets "")
+  foreach(set IN LISTS sets)
+    list(
+      APPEND
+      fileSets
+      FILE_SET
+      ${set}
+      DESTINATION
+      ${CMAKE_INSTALL_INCLUDEDIR}/${PHP_INCLUDE_PREFIX}/ext/${extension}
+    )
+  endforeach()
   install(
     TARGETS php_${extension}
     ARCHIVE EXCLUDE_FROM_ALL
     RUNTIME
       DESTINATION ${PHP_EXTENSION_DIR}
     LIBRARY
       DESTINATION ${PHP_EXTENSION_DIR}
-    FILE_SET HEADERS
-      DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PHP_INCLUDE_PREFIX}/ext/${extension}
+    ${fileSets}
   )
 
   # Configure shared extension.

cmake/ext/date/lib/CMakeLists.txt

@@ -13,6 +13,10 @@ add_subdirectory(lib)
 ```
 #]=============================================================================]
 
+cmake_minimum_required(VERSION 3.25...3.31)
+
+project(Timelib LANGUAGES C)
+
 include(CheckIncludeFile)
 
 if(NOT TIMELIB_TARGET)
@@ -36,14 +40,15 @@ set(
 
 target_sources(
   ${TIMELIB_TARGET}
-  PRIVATE ${timelibSources}
+  PRIVATE
+    ${timelibSources}
   PUBLIC
     FILE_SET HEADERS
       FILES
         timelib.h
-  # A separate file set so binary dir can also be created within a source dir.
   PUBLIC
-    FILE_SET HEADERS
+    FILE_SET generated
+      TYPE HEADERS
       BASE_DIRS $<TARGET_PROPERTY:${TIMELIB_TARGET},BINARY_DIR>
       FILES
         ${CMAKE_CURRENT_BINARY_DIR}/timelib_config.h
@@ -59,8 +64,6 @@ target_compile_definitions(
     HAVE_STRTOLL
 )
 
-# The libmbfl configuration.
-
 check_include_file(io.h HAVE_IO_H)
 
 cmake_path(
@@ -70,7 +73,6 @@ cmake_path(
   OUTPUT_VARIABLE relativeDir
 )
 message(STATUS "Creating ${relativeDir}/timelib_config.h")
-
 file(CONFIGURE OUTPUT timelib_config.h CONTENT [[
 /* Define to 1 if you have the <io.h> header file. */
 #cmakedefine HAVE_IO_H 1

cmake/ext/mbstring/libmbfl/CMakeLists.txt

@@ -79,9 +79,9 @@ target_sources(
         mbfl/mbfl_language.h
         mbfl/mbfl_memory_device.h
         mbfl/mbfl_string.h
-  # A separate file set so binary dir can also be created within a source dir.
   PUBLIC
-    FILE_SET HEADERS
+    FILE_SET generated
+      TYPE HEADERS
       BASE_DIRS $<TARGET_PROPERTY:${LIBMBFL_TARGET},BINARY_DIR>
       FILES
         ${CMAKE_CURRENT_BINARY_DIR}/config.h

cmake/main/CMakeLists.txt

@@ -92,9 +92,9 @@ target_sources(
         streams/php_stream_userspace.h
         streams/php_streams_int.h
         streams/userspace_arginfo.h
-  # A separate file set so binary dir can also be created within a source dir.
   PUBLIC
-    FILE_SET HEADERS
+    FILE_SET generated
+      TYPE HEADERS
       BASE_DIRS ${CMAKE_CURRENT_BINARY_DIR}
       FILES
         $<$<PLATFORM_ID:Windows>:${CMAKE_CURRENT_BINARY_DIR}/config.w32.h>
@@ -415,4 +415,6 @@ install(
   ARCHIVE EXCLUDE_FROM_ALL
   FILE_SET HEADERS
     DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PHP_INCLUDE_PREFIX}/main
+  FILE_SET generated
+    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PHP_INCLUDE_PREFIX}/main
 )

cmake/win32/CMakeLists.txt

@@ -59,9 +59,9 @@ target_sources(
         time.h
         unistd.h
         winutil.h
-  # A separate file set so binary dir can also be created within a source dir.
   PUBLIC
-    FILE_SET HEADERS
+    FILE_SET generated
+      TYPE HEADERS
       BASE_DIRS ${CMAKE_CURRENT_BINARY_DIR}
       FILES
         ${CMAKE_CURRENT_BINARY_DIR}/wsyslog.h
@@ -163,4 +163,6 @@ install(
   ARCHIVE EXCLUDE_FROM_ALL
   FILE_SET HEADERS
     DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PHP_INCLUDE_PREFIX}/win32
+  FILE_SET generated
+    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PHP_INCLUDE_PREFIX}/win32
 )