Remove PHP_LAYOUT and adjust installation

- The PHP_LAYOUT to match the PHP Autotools --with-layout configure
  option is a redundant configuration to simplify the installation a bit
  further.
- Added program prefixes and suffixes
- Fixed php_configure_file for phpize and php_config scripts
- Move fuzzer SAPI few steps forward

Author: petk

cmake/cmake/Configuration.cmake

@@ -48,18 +48,6 @@ mark_as_advanced(PHP_BUILD_COMPILER)
 set(PHP_BUILD_PROVIDER "" CACHE STRING "Build provider displayed in phpinfo")
 mark_as_advanced(PHP_BUILD_PROVIDER)
 
-set(
-  PHP_LAYOUT "PHP"
-  CACHE STRING
-  "Set how installed files will be laid out. Type can be PHP (default) or GNU"
-)
-set_property(CACHE PHP_LAYOUT PROPERTY STRINGS "GNU" "PHP")
-mark_as_advanced(PHP_LAYOUT)
-
-if(NOT PHP_LAYOUT STREQUAL "GNU")
-  # TODO: DATAROOTDIR should be "php" instead of default "share".
-endif()
-
 set(
   PHP_INCLUDE_PREFIX "php"
   CACHE STRING
@@ -98,24 +86,17 @@ endif()
 if(NOT CMAKE_SYSTEM_NAME STREQUAL "Windows")
   set(
     PHP_CONFIG_FILE_PATH ""
-    CACHE FILEPATH "The path in which to look for php.ini; By default it is set\
-    to sysconfdir (for GNU layout) or libdir (for PHP layout); Pass it as a\
-    relative string inside the install prefix, which will be automatically\
-    prepended; If given as an absolute path, prefix is not appended."
+    CACHE FILEPATH "The path in which to look for php.ini; By default, it is\
+    set to SYSCONFDIR (etc); Relative path gets the CMAKE_INSTALL_PREFIX\
+    automatically prepended; If given as an absolute path, install prefix is\
+    not appended."
   )
   mark_as_advanced(PHP_CONFIG_FILE_PATH)
   if(NOT PHP_CONFIG_FILE_PATH)
-    if(PHP_LAYOUT STREQUAL "GNU")
-      set_property(
-        CACHE PHP_CONFIG_FILE_PATH
-        PROPERTY VALUE "${CMAKE_INSTALL_SYSCONFDIR}"
-      )
-    else()
-      set_property(
-        CACHE PHP_CONFIG_FILE_PATH
-        PROPERTY VALUE "${CMAKE_INSTALL_LIBDIR}"
-      )
-    endif()
+    set_property(
+      CACHE PHP_CONFIG_FILE_PATH
+      PROPERTY VALUE "${CMAKE_INSTALL_SYSCONFDIR}"
+    )
   endif()
   set(
     PHP_FULL_CONFIG_FILE_PATH "" CACHE INTERNAL
@@ -226,16 +207,15 @@ block()
 
     set(extension_dir "${CMAKE_INSTALL_LIBDIR}/php")
 
-    if(PHP_LAYOUT STREQUAL "GNU")
-      set(extension_dir "${extension_dir}/${zend_module_api_no}")
-      set(extension_dir "${extension_dir}$<$<BOOL:$<TARGET_PROPERTY:php_configuration,PHP_THREAD_SAFETY>>:-zts>")
-      set(extension_dir "${extension_dir}$<IF:$<CONFIG:Debug,DebugAssertions>,-debug,>")
-    else()
-      set(extension_dir "${extension_dir}/extensions")
-      set(extension_dir "${extension_dir}/$<IF:$<CONFIG:Debug,DebugAssertions>,debug,no-debug>")
-      set(extension_dir "${extension_dir}$<IF:$<BOOL:$<TARGET_PROPERTY:php_configuration,PHP_THREAD_SAFETY>>,-zts,-non-zts>")
-      set(extension_dir "${extension_dir}-${zend_module_api_no}")
-    endif()
+    # This resembles the PHP Autotools --with-layout=GNU:
+    set(extension_dir "${extension_dir}/${zend_module_api_no}")
+    set(extension_dir "${extension_dir}$<$<BOOL:$<TARGET_PROPERTY:php_configuration,PHP_THREAD_SAFETY>>:-zts>")
+    set(extension_dir "${extension_dir}$<$<CONFIG:Debug,DebugAssertions>:-debug>")
+    # This would be the PHP Autotools --with-layout=PHP (default):
+    # set(extension_dir "${extension_dir}/extensions")
+    # set(extension_dir "${extension_dir}/$<IF:$<CONFIG:Debug,DebugAssertions>,debug,no-debug>")
+    # set(extension_dir "${extension_dir}$<IF:$<BOOL:$<TARGET_PROPERTY:php_configuration,PHP_THREAD_SAFETY>>,-zts,-non-zts>")
+    # set(extension_dir "${extension_dir}-${zend_module_api_no}")
 
     set_property(CACHE PHP_EXTENSION_DIR PROPERTY VALUE "${extension_dir}")
   endif()

cmake/cmake/modules/PHP/ConfigureFile.cmake

@@ -174,7 +174,7 @@ function(php_configure_file)
   cmake_path(GET ___phpConfigureFileOutput FILENAME filename)
   set(
     ___phpConfigureFileOutputTemporary
-    ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${filename}.cmake.in
+    ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/__phpConfigureFile_${filename}.cmake.in
   )
 
   if(parsed_VARIABLES)

cmake/cmake/modules/Packages/LibXml2.cmake

@@ -9,7 +9,7 @@ See: https://cmake.org/cmake/help/latest/module/FindLibXml2.html
 
 The `FetchContent` CMake module does things differently compared to the
 `find_package()` flow:
-* By default it uses `QUIET` in its `find_package()` call when calling the
+* By default, it uses `QUIET` in its `find_package()` call when calling the
   `FetchContent_MakeAvailable()`;
 * When using `FeatureSummary`, dependencies must be moved manually to
   `PACKAGES_FOUND` from the `PACKAGES_NOT_FOUND` global property;

cmake/ext/phar/CMakeLists.txt

@@ -196,7 +196,7 @@ if(PHP_EXECUTABLE)
           -d phar.readonly=0
           ${CMAKE_CURRENT_BINARY_DIR}/phar.php
             pack
-            -f \${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/phar.phar
+            -f ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${PHP_PROGRAM_PREFIX}phar${PHP_PROGRAM_SUFFIX}.phar
             -a pharcommand
             -c auto
             -p 0
@@ -207,8 +207,9 @@ if(PHP_EXECUTABLE)
     )
 
     file(
-      CHMOD
-      \${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/phar.phar
+      INSTALL
+      ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${PHP_PROGRAM_PREFIX}phar${PHP_PROGRAM_SUFFIX}.phar
+      DESTINATION \${DESTDIR}\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}
       FILE_PERMISSIONS
         OWNER_READ
         OWNER_WRITE
@@ -221,8 +222,8 @@ if(PHP_EXECUTABLE)
 
     file(
       CREATE_LINK
-      phar.phar
-      \${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/phar
+      ${PHP_PROGRAM_PREFIX}phar${PHP_PROGRAM_SUFFIX}.phar
+      \${DESTDIR}\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/phar
       SYMBOLIC
     )
   ")
@@ -233,8 +234,13 @@ configure_file(phar.1.in phar.1 @ONLY)
 configure_file(phar.phar.1.in phar.phar.1 @ONLY)
 
 install(
-  FILES
-    ${CMAKE_CURRENT_BINARY_DIR}/phar.1
-    ${CMAKE_CURRENT_BINARY_DIR}/phar.phar.1
+  FILES ${CMAKE_CURRENT_BINARY_DIR}/phar.1
+  RENAME ${PHP_PROGRAM_PREFIX}phar${PHP_PROGRAM_SUFFIX}.1
+  DESTINATION ${CMAKE_INSTALL_MANDIR}/man1
+)
+
+install(
+  FILES ${CMAKE_CURRENT_BINARY_DIR}/phar.phar.1
+  RENAME ${PHP_PROGRAM_PREFIX}phar${PHP_PROGRAM_SUFFIX}.phar.1
   DESTINATION ${CMAKE_INSTALL_MANDIR}/man1
 )

cmake/pear/CMakeLists.txt

@@ -44,11 +44,7 @@ if(NOT EXT_XML)
 endif()
 
 if(NOT PHP_PEAR_DIR)
-  if(PHP_LAYOUT STREQUAL "GNU")
-    set(_php_pear_dir "\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/pear")
-  else()
-    set(_php_pear_dir "\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/php")
-  endif()
+  set(_php_pear_dir "\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/pear")
 else()
   set(_php_pear_dir "${PHP_PEAR_DIR}")
 endif()

cmake/sapi/cgi/CMakeLists.txt

@@ -39,7 +39,7 @@ target_link_options(
 set_target_properties(
   php_cgi
   PROPERTIES
-    OUTPUT_NAME php-cgi
+    OUTPUT_NAME ${PHP_PROGRAM_PREFIX}php-cgi${PHP_PROGRAM_SUFFIX}
     # TODO: Check if there's a better solution here:
     ENABLE_EXPORTS TRUE
 )
@@ -67,7 +67,7 @@ install(
 )
 
 install(
-  FILES
-    ${CMAKE_CURRENT_BINARY_DIR}/php-cgi.1
+  FILES ${CMAKE_CURRENT_BINARY_DIR}/php-cgi.1
+  RENAME ${PHP_PROGRAM_PREFIX}php-cgi${PHP_PROGRAM_SUFFIX}.1
   DESTINATION ${CMAKE_INSTALL_MANDIR}/man1
 )

cmake/sapi/cli/CMakeLists.txt

@@ -92,7 +92,7 @@ target_link_options(
 set_target_properties(
   php_cli
   PROPERTIES
-    OUTPUT_NAME php
+    OUTPUT_NAME ${PHP_PROGRAM_PREFIX}php${PHP_PROGRAM_SUFFIX}
     # TODO: Check if there's a better solution here:
     ENABLE_EXPORTS TRUE
 )
@@ -113,7 +113,11 @@ if(SAPI_CLI_WIN_NO_CONSOLE)
     ps_title.c
   )
 
-  set_target_properties(php_cli_win_no_console PROPERTIES OUTPUT_NAME php-win)
+  set_target_properties(
+    php_cli_win_no_console
+    PROPERTIES
+      OUTPUT_NAME ${PHP_PROGRAM_PREFIX}php-win${PHP_PROGRAM_SUFFIX}
+  )
 
   target_compile_definitions(
     php_cli_win_no_console
@@ -150,7 +154,7 @@ install(
 )
 
 install(
-  FILES
-    ${CMAKE_CURRENT_BINARY_DIR}/php.1
+  FILES ${CMAKE_CURRENT_BINARY_DIR}/php.1
+  RENAME ${PHP_PROGRAM_PREFIX}php${PHP_PROGRAM_SUFFIX}.1
   DESTINATION ${CMAKE_INSTALL_MANDIR}/man1
 )

cmake/sapi/fpm/CMakeLists.txt

@@ -157,7 +157,7 @@ target_link_libraries(php_fpm PRIVATE PHP::main)
 set_target_properties(
   php_fpm
   PROPERTIES
-    OUTPUT_NAME php-fpm
+    OUTPUT_NAME ${PHP_PROGRAM_PREFIX}php-fpm${PHP_PROGRAM_SUFFIX}
     # TODO: Check if there's a better solution here:
     ENABLE_EXPORTS TRUE
 )
@@ -471,7 +471,6 @@ php_configure_file(
     EXPANDED_SYSCONFDIR "$<PATH:ABSOLUTE_PATH,NORMALIZE,${CMAKE_INSTALL_SYSCONFDIR},$<INSTALL_PREFIX>>"
 )
 
-# TODO: Add program file prefix and suffix.
 install(TARGETS php_fpm DESTINATION ${CMAKE_INSTALL_SBINDIR})
 
 # Create log and run directories on installation.

cmake/sapi/fuzzer/CMakeLists.txt

@@ -50,6 +50,8 @@ if(PHP_THREAD_SAFETY)
   )
 endif()
 
+add_executable(php_fuzzer)
+
 if(LIB_FUZZING_ENGINE OR "$ENV{LIB_FUZZING_ENGINE}")
   if(LIB_FUZZING_ENGINE)
     set(libFuzzingEngine "${LIB_FUZZING_ENGINE}")
@@ -108,7 +110,14 @@ else()
   )
 endif()
 
-#add_executable(php_fuzzer)
-#set_target_properties(php_fuzzer PROPERTIES OUTPUT_NAME fuzzer)
-#target_link_libraries(php_fuzzer PRIVATE PHP::main)
-#install(TARGETS php_fuzzer DESTINATION ${CMAKE_INSTALL_BINDIR})
+target_sources(php_fuzzer PRIVATE fuzzer-sapi.c)
+
+set_target_properties(
+  php_fuzzer
+  PROPERTIES
+    OUTPUT_NAME ${PHP_PROGRAM_PREFIX}fuzzer${PHP_PROGRAM_SUFFIX}
+)
+
+target_link_libraries(php_fuzzer PRIVATE PHP::main)
+
+install(TARGETS php_fuzzer RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})

cmake/sapi/litespeed/CMakeLists.txt

@@ -31,12 +31,11 @@ target_link_libraries(php_litespeed PRIVATE PHP::main)
 set_target_properties(
   php_litespeed
   PROPERTIES
-    OUTPUT_NAME lsphp
+    OUTPUT_NAME ${PHP_PROGRAM_PREFIX}lsphp${PHP_PROGRAM_SUFFIX}
     # TODO: Check if there's a better solution here.
     ENABLE_EXPORTS TRUE
 )
 
-# TODO: Add prefix and suffix to installed executable file.
 install(
   TARGETS php_litespeed
   RUNTIME