Fix nits

- Using CMAKE_ROLE global property where possible
- Some generated files are now created with configure to pass less
  variables to command-line scripts

Author: petk

cmake/Zend/cmake/GenerateGrammar.cmake

@@ -41,10 +41,10 @@ block()
     [[
       foreach(
         file IN ITEMS
-          @CMAKE_CURRENT_SOURCE_DIR@/zend_language_parser.h
-          @CMAKE_CURRENT_SOURCE_DIR@/zend_language_parser.c
+          zend_language_parser.h
+          zend_language_parser.c
       )
-        file(READ "${file}" content)
+        file(READ "@CMAKE_CURRENT_SOURCE_DIR@/${file}" content)
         string(
           REPLACE
           "int zendparse"
@@ -56,9 +56,8 @@ block()
           NOT content MATCHES "ZEND_API int zendparse"
           AND NOT content STREQUAL "${patchedContent}"
         )
-          cmake_path(GET file FILENAME filename)
-          message(STATUS "[Zend] Patching ${filename}")
-          file(WRITE "${file}" "${patchedContent}")
+          message(STATUS "[Zend] Patching ${file}")
+          file(WRITE "@CMAKE_CURRENT_SOURCE_DIR@/${file}" "${patchedContent}")
         endif()
       endforeach()
     ]]

cmake/cmake/modules/FindDTrace.cmake

@@ -189,21 +189,22 @@ function(dtrace_target)
 
   # Generate DTrace header.
   file(
-    GENERATE
+    CONFIGURE
     OUTPUT CMakeFiles/GenerateDTraceHeader.cmake
     CONTENT [[
       execute_process(
-        COMMAND ${DTrace_EXECUTABLE}
-          -s "${parsed_INPUT}"
-          -h                    # Generate a SystemTap header file.
-          -C                    # Run the cpp preprocessor on the input file.
-          -o "${parsed_HEADER}" # Name of the output file.
+        COMMAND "@DTrace_EXECUTABLE@"
+          -s "@parsed_INPUT@"  # Input file.
+          -h                   # Generate a SystemTap header file.
+          -C                   # Run the C preprocessor (cpp) on the input file.
+          -o "@parsed_HEADER@" # Output file.
       )
       # Patch DTrace header.
-      file(READ "${parsed_HEADER}" content)
+      file(READ "@parsed_HEADER@" content)
       string(REPLACE "PHP_" "DTRACE_" content "${content}")
-      file(WRITE "${parsed_HEADER}" "${content}")
+      file(WRITE "@parsed_HEADER@" "${content}")
     ]]
+    @ONLY
   )
   cmake_path(
     RELATIVE_PATH
@@ -213,11 +214,7 @@ function(dtrace_target)
   )
   add_custom_command(
     OUTPUT ${parsed_HEADER}
-    COMMAND ${CMAKE_COMMAND}
-      -DDTrace_EXECUTABLE=${DTrace_EXECUTABLE}
-      -Dparsed_HEADER=${parsed_HEADER}
-      -Dparsed_INPUT=${parsed_INPUT}
-      -P CMakeFiles/GenerateDTraceHeader.cmake
+    COMMAND ${CMAKE_COMMAND} -P CMakeFiles/GenerateDTraceHeader.cmake
     DEPENDS "${parsed_INPUT}"
     COMMENT "[DTrace] Generating ${header}"
     VERBATIM

cmake/cmake/modules/FindICU.cmake

@@ -40,9 +40,3 @@ endif()
 # Find package with upstream CMake find module. Absolute path prevents the
 # maximum nesting/recursion depth error on some systems, like macOS.
 include(${CMAKE_ROOT}/Modules/FindICU.cmake)
-
-# Upstream CMake module doesn't mark these as advanced variables.
-# https://gitlab.kitware.com/cmake/cmake/-/merge_requests/9199
-if(CMAKE_VERSION VERSION_LESS 3.29)
-  mark_as_advanced(ICU_INCLUDE_DIR)
-endif()

cmake/cmake/modules/FindLibXslt.cmake

@@ -24,9 +24,3 @@ set_package_properties(
 # Find package with upstream CMake find module. Absolute path prevents the
 # maximum nesting/recursion depth error on some systems, like macOS.
 include(${CMAKE_ROOT}/Modules/FindLibXslt.cmake)
-
-# Upstream CMake module doesn't mark these as advanced variables.
-# https://gitlab.kitware.com/cmake/cmake/-/merge_requests/8807
-if(CMAKE_VERSION VERSION_LESS 3.28)
-  mark_as_advanced(LIBXSLT_EXSLT_INCLUDE_DIR LIBXSLT_LIBRARY)
-endif()

cmake/cmake/modules/PHP/Bison.cmake

@@ -33,8 +33,9 @@ being relative to the current binary directory. If generated files are already
 available (for example, shipped with the released archive), and Bison is not
 found, it will create a target but skip the `bison` command-line execution.
 
-When used in command-line script mode (see `CMAKE_SCRIPT_MODE_FILE`) it
-generates the parser right away without creating a target.
+When the `CMAKE_ROLE` global property value is not `PROJECT` (running is some
+script mode) it generates the files right away without creating a target. For
+example, in command-line scripts.
 
 #### Options
 
@@ -49,9 +50,9 @@ generates the parser right away without creating a target.
   `bison` command-line invocation. This module provides some sensible defaults.
 
 * `OPTIONS <options>...` - List of additional options to pass to the `bison`
-  command-line tool. Supports generator expressions. In script mode
-  (`CMAKE_SCRIPT_MODE_FILE`) generator expressions are stripped as they can't be
-  determined.
+  command-line tool. Supports generator expressions. In script modes
+  (`CMAKE_ROLE` is not `PROJECT`) generator expressions are stripped as they
+  can't be determined.
 
 * `DEPENDS <depends>...` - Optional list of dependent files to regenerate the
   output file.
@@ -152,7 +153,7 @@ include(PHP/Bison)
 php_bison(foo foo.y foo.c OPTIONS $<$<CONFIG:Debug>:--debug> --yacc)
 # When build type is Debug, this will run:
 #   bison --debug --yacc foo.y --output foo.c
-# For other build types (including the script mode - CMAKE_SCRIPT_MODE_FILE):
+# For other build types, including the script modes (CMAKE_ROLE is not PROJECT):
 #   bison --yacc foo.y --output foo.c
 ```
 
@@ -211,13 +212,15 @@ include(FeatureSummary)
 
 # Configuration after find_package() in this module.
 macro(_php_bison_config_options)
-  # Add --no-lines (-l) option to not output '#line' directives.
   if(NOT PHP_BISON_OPTIONS)
-    if(CMAKE_SCRIPT_MODE_FILE)
-      set(PHP_BISON_OPTIONS --no-lines)
-    else()
+    # Add --no-lines (-l) option to not output '#line' directives.
+    get_property(_role GLOBAL PROPERTY CMAKE_ROLE)
+    if(_role STREQUAL "PROJECT")
       set(PHP_BISON_OPTIONS $<$<CONFIG:Release,MinSizeRel>:--no-lines>)
+    else()
+      set(PHP_BISON_OPTIONS --no-lines)
     endif()
+    unset(_role)
 
     # Report all warnings.
     list(APPEND PHP_BISON_OPTIONS -Wall)
@@ -290,11 +293,13 @@ function(php_bison name input output)
     find_package(BISON ${PHP_BISON_VERSION} ${quiet})
   endif()
 
+  get_property(role GLOBAL PROPERTY CMAKE_ROLE)
+
   if(
     NOT BISON_FOUND
     AND PHP_BISON_VERSION_DOWNLOAD
     AND packageType STREQUAL "REQUIRED"
-    AND NOT CMAKE_SCRIPT_MODE_FILE
+    AND role STREQUAL "PROJECT"
     # TODO: Support for other platforms.
     AND CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux"
   )
@@ -324,7 +329,7 @@ function(php_bison name input output)
   _php_bison_process_header_option()
   _php_bison_process_verbose_option()
 
-  if(NOT CMAKE_SCRIPT_MODE_FILE)
+  if(role STREQUAL "PROJECT")
     add_custom_target(${name} SOURCES ${input} DEPENDS ${outputs})
   endif()
 
@@ -344,7 +349,7 @@ function(php_bison name input output)
   )
   set(message "[Bison] Generating ${relativePath} with Bison ${BISON_VERSION}")
 
-  if(CMAKE_SCRIPT_MODE_FILE)
+  if(NOT role STREQUAL "PROJECT")
     message(STATUS "${message}")
     execute_process(${commands} WORKING_DIRECTORY ${parsed_WORKING_DIRECTORY})
     return()
@@ -389,7 +394,8 @@ function(_php_bison_process_options)
   endif()
 
   # Remove any generator expressions when running in script mode.
-  if(CMAKE_SCRIPT_MODE_FILE)
+  get_property(role GLOBAL PROPERTY CMAKE_ROLE)
+  if(NOT role STREQUAL "PROJECT")
     list(TRANSFORM options GENEX_STRIP)
   endif()
 

cmake/cmake/modules/PHP/Re2c.cmake

@@ -33,8 +33,9 @@ being relative to the current binary directory. If generated files are already
 available (for example, shipped with the released archive), and re2c is not
 found, it will create a target but skip the `re2c` command-line execution.
 
-When used in command-line script mode (see `CMAKE_SCRIPT_MODE_FILE`) it
-generates the lexer right away without creating a target.
+When the `CMAKE_ROLE` global property value is not `PROJECT` (running is some
+script mode) it generates the files right away without creating a target. For
+example, in command-line scripts.
 
 #### Options
 
@@ -46,18 +47,18 @@ generates the lexer right away without creating a target.
   `re2c` command-line invocation. This module provides some sensible defaults.
 
 * `OPTIONS <options>...` - List of additional options to pass to the `re2c`
-  command-line tool. Supports generator expressions. In script mode
-  (`CMAKE_SCRIPT_MODE_FILE`) generator expressions are stripped as they can't be
-  determined.
+  command-line tool. Supports generator expressions. In script modes
+  (`CMAKE_ROLE` is not `PROJECT`) generator expressions are stripped as they
+  can't be determined.
 
 * `DEPENDS <depends>...` - Optional list of dependent files to regenerate the
   output file.
 
 * `COMPUTED_GOTOS <TRUE|FALSE>` - Set to `TRUE` to add the `--computed-gotos`
   (`-g`) command-line option if the non-standard C computed goto extension is
-  supported by the C compiler. When calling `re2c()` in the command-line script
-  mode (`CMAKE_SCRIPT_MODE`), option is not checked, whether the compiler
-  supports it and is added unconditionally.
+  supported by the C compiler. When calling `re2c()` in some script mode
+  (`CMAKE_ROLE` value other than `PROJECT`), compiler checking is skipped and
+  option is added unconditionally.
 
 * `CODEGEN` - Adds the `CODEGEN` option to the `add_custom_command()` call. This
   option is available starting with CMake 3.31 when the policy `CMP0171` is set
@@ -149,7 +150,7 @@ include(PHP/Re2c)
 php_re2c(foo foo.re foo.c OPTIONS $<$<CONFIG:Debug>:--debug-output> -F)
 # When build type is Debug, this will run:
 #   re2c --debug-output -F --output foo.c foo.re
-# For other build types (including the script mode - CMAKE_SCRIPT_MODE_FILE):
+# For other build types, including the script modes (CMAKE_ROLE is not PROJECT):
 #   re2c -F --output foo.c foo.re
 ```
 
@@ -213,11 +214,13 @@ mark_as_advanced(PHP_RE2C_COMPUTED_GOTOS)
 macro(_php_re2c_config_options)
   if(NOT PHP_RE2C_OPTIONS)
     # Add --no-debug-info (-i) option to not output '#line' directives.
-    if(CMAKE_SCRIPT_MODE_FILE)
-      set(PHP_RE2C_OPTIONS --no-debug-info)
-    else()
+    get_property(_role GLOBAL PROPERTY CMAKE_ROLE)
+    if(_role STREQUAL "PROJECT")
       set(PHP_RE2C_OPTIONS $<$<CONFIG:Release,MinSizeRel>:--no-debug-info>)
+    else()
+      set(PHP_RE2C_OPTIONS --no-debug-info)
     endif()
+    unset(_role)
 
     # Suppress date output in the generated file.
     list(APPEND PHP_RE2C_OPTIONS --no-generation-date)
@@ -298,11 +301,13 @@ function(php_re2c name input output)
     find_package(RE2C ${PHP_RE2C_VERSION} ${quiet})
   endif()
 
+  get_property(role GLOBAL PROPERTY CMAKE_ROLE)
+
   if(
     NOT RE2C_FOUND
     AND PHP_RE2C_VERSION_DOWNLOAD
     AND packageType STREQUAL "REQUIRED"
-    AND NOT CMAKE_SCRIPT_MODE_FILE
+    AND role STREQUAL "PROJECT"
   )
     _php_re2c_download()
   endif()
@@ -329,7 +334,7 @@ function(php_re2c name input output)
   _php_re2c_process_options()
   _php_re2c_process_header_option()
 
-  if(NOT CMAKE_SCRIPT_MODE_FILE)
+  if(role STREQUAL "PROJECT")
     add_custom_target(${name} SOURCES ${input} DEPENDS ${outputs})
   endif()
 
@@ -350,7 +355,7 @@ function(php_re2c name input output)
   )
   set(message "[re2c] Generating ${relativePath} with re2c ${RE2C_VERSION}")
 
-  if(CMAKE_SCRIPT_MODE_FILE)
+  if(NOT role STREQUAL "PROJECT")
     message(STATUS "${message}")
     execute_process(${commands} WORKING_DIRECTORY ${parsed_WORKING_DIRECTORY})
     return()
@@ -431,7 +436,8 @@ function(_php_re2c_process_options)
   endif()
 
   # Remove any generator expressions when running in script mode.
-  if(CMAKE_SCRIPT_MODE_FILE)
+  get_property(role GLOBAL PROPERTY CMAKE_ROLE)
+  if(NOT role STREQUAL "PROJECT")
     list(TRANSFORM options GENEX_STRIP)
   endif()
 
@@ -483,7 +489,8 @@ endfunction()
 
 # Check for re2c --computed-gotos option.
 function(_php_re2c_check_computed_gotos result)
-  if(CMAKE_SCRIPT_MODE_FILE)
+  get_property(role GLOBAL PROPERTY CMAKE_ROLE)
+  if(NOT role STREQUAL "PROJECT")
     set(${result} TRUE)
     return(PROPAGATE ${result})
   endif()

cmake/ext/phar/CMakeLists.txt

@@ -189,12 +189,12 @@ add_custom_command(
 
 # Set phar.phar permissions.
 file(
-  GENERATE
+  CONFIGURE
   OUTPUT CMakeFiles/PharPermissions.cmake
-  CONTENT "
+  CONTENT [[
     file(
       CHMOD
-      ${CMAKE_CURRENT_BINARY_DIR}/phar.phar
+      "@CMAKE_CURRENT_BINARY_DIR@/phar.phar"
       FILE_PERMISSIONS
         OWNER_READ
         OWNER_WRITE
@@ -205,15 +205,14 @@ file(
         WORLD_READ
         WORLD_EXECUTE
     )
-  "
+  ]]
+  @ONLY
 )
 
 add_custom_command(
   OUTPUT php_ext_phar_generated_phar
-  COMMAND
-    ${CMAKE_COMMAND} -P CMakeFiles/PharPermissions.cmake
-  DEPENDS
-    ${CMAKE_CURRENT_BINARY_DIR}/phar.phar
+  COMMAND ${CMAKE_COMMAND} -P CMakeFiles/PharPermissions.cmake
+  DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/phar.phar
   COMMENT "[ext/phar] Generating ${relativeDir}/phar"
 )