Fix nits

Author: petk

cmake/cmake/modules/FindDTrace.cmake

@@ -207,7 +207,8 @@ function(dtrace_target)
     OUTPUT CMakeFiles/GenerateDTraceHeader.cmake
     CONTENT [[
       execute_process(
-        COMMAND "@DTrace_EXECUTABLE@"
+        COMMAND
+          "@DTrace_EXECUTABLE@"
           -s "@parsed_INPUT@"  # Input file.
           -h                   # Generate a SystemTap header file.
           -C                   # Run the C preprocessor (cpp) on the input file.

cmake/cmake/modules/FindGcov.cmake

@@ -127,7 +127,8 @@ macro(gcov_generate_report)
     CONTENT "
       message(STATUS \"Generating lcov data for php_lcov.info\")
       execute_process(
-        COMMAND ${Gcov_LCOV_EXECUTABLE}
+        COMMAND
+          ${Gcov_LCOV_EXECUTABLE}
           --capture
           --no-external
           --directory ${PROJECT_BINARY_DIR}
@@ -136,7 +137,8 @@ macro(gcov_generate_report)
 
       message(STATUS \"Stripping bundled libraries from php_lcov.info\")
       execute_process(
-        COMMAND ${Gcov_LCOV_EXECUTABLE}
+        COMMAND
+          ${Gcov_LCOV_EXECUTABLE}
           --output-file ${PROJECT_BINARY_DIR}/php_lcov.info
           --remove ${PROJECT_BINARY_DIR}/php_lcov.info */<stdout>
             ${PROJECT_BINARY_DIR}/ext/bcmath/libbcmath/*
@@ -152,7 +154,8 @@ macro(gcov_generate_report)
 
       message(STATUS \"Generating lcov HTML\")
       execute_process(
-        COMMAND ${Gcov_GENHTML_EXECUTABLE}
+        COMMAND
+          ${Gcov_GENHTML_EXECUTABLE}
           --legend
           --output-directory ${PROJECT_BINARY_DIR}/lcov_html
           --title \"PHP Code Coverage\"
@@ -169,7 +172,8 @@ macro(gcov_generate_report)
       endif()
       file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/gcovr_html)
       execute_process(
-        COMMAND ${Gcov_GCOVR_EXECUTABLE}
+        COMMAND
+          ${Gcov_GCOVR_EXECUTABLE}
           -sr ${PROJECT_BINARY_DIR}
           -o ${PROJECT_BINARY_DIR}/gcovr_html/index.html
           --html
@@ -192,7 +196,8 @@ macro(gcov_generate_report)
         file(REMOVE ${PROJECT_BINARY_DIR}/gcovr.xml)
       endif()
       execute_process(
-        COMMAND ${Gcov_GCOVR_EXECUTABLE}
+        COMMAND
+          ${Gcov_GCOVR_EXECUTABLE}
           -sr ${PROJECT_BINARY_DIR}
           -o ${PROJECT_BINARY_DIR}/gcovr.xml
           --xml

cmake/cmake/modules/FindMC.cmake

@@ -227,7 +227,8 @@ function(mc_target)
 
   add_custom_command(
     OUTPUT "${output}"
-    COMMAND ${MC_EXECUTABLE}
+    COMMAND
+      ${MC_EXECUTABLE}
       # Header export directory:
       -h "${parsed_HEADER_DIR}"
       # Export directory for rc files:

cmake/cmake/modules/PHP/AddCustomCommand.cmake

@@ -106,11 +106,11 @@ function(php_add_custom_command)
     return()
   endif()
 
-  set(target_name ${ARGV0})
-
   add_custom_target(
-    ${target_name} ALL
-    COMMAND ${CMAKE_COMMAND}
+    ${ARGV0}
+    ALL
+    COMMAND
+      ${CMAKE_COMMAND}
       -D "PHP_EXECUTABLE=${PHP_EXECUTABLE}"
       -D "OUTPUT=${parsed_OUTPUT}"
       -D "PHP_COMMAND=${parsed_PHP_COMMAND}"

cmake/pear/cmake/InstallPear.cmake

@@ -71,7 +71,8 @@ if(NOT EXISTS ${php_pear_current_binary_dir}/install-pear-nozlib.phar)
   if(php_pear_php_executable AND NOT download_status)
     # Download using fetch.php.
     execute_process(
-      COMMAND ${php_pear_php_executable}
+      COMMAND
+        ${php_pear_php_executable}
         -n
         ${php_pear_current_source_dir}/fetch.php
         ${php_pear_installer_url}
@@ -156,24 +157,25 @@ endif()
 
 # Run the PEAR installer.
 execute_process(
-  COMMAND ${php_pear_php_executable}
-  -n
-  -dshort_open_tag=0
-  -dopen_basedir=
-  -derror_reporting=1803
-  -dmemory_limit=-1
-  ${php_pear_options}
-  ${php_pear_current_binary_dir}/install-pear-nozlib.phar
-    --dir "${php_pear_install_dir}"
-    --bin "${php_pear_install_bin_dir}"
-    --metadata "${php_pear_install_dir}"
-    --data "${php_pear_install_dir}"
-    --temp "${php_pear_stage_temp_dir}"
-    --cache "${php_pear_temp_dir}/cache"
-    --download "${php_pear_temp_dir}/download"
-    --php ${php_pear_installed_php_bin}
-    -dp a${php_pear_php_program_prefix}
-    -ds a${php_pear_php_program_suffix}
+  COMMAND
+    ${php_pear_php_executable}
+    -n
+    -dshort_open_tag=0
+    -dopen_basedir=
+    -derror_reporting=1803
+    -dmemory_limit=-1
+    ${php_pear_options}
+    ${php_pear_current_binary_dir}/install-pear-nozlib.phar
+      --dir "${php_pear_install_dir}"
+      --bin "${php_pear_install_bin_dir}"
+      --metadata "${php_pear_install_dir}"
+      --data "${php_pear_install_dir}"
+      --temp "${php_pear_stage_temp_dir}"
+      --cache "${php_pear_temp_dir}/cache"
+      --download "${php_pear_temp_dir}/download"
+      --php ${php_pear_installed_php_bin}
+      -dp a${php_pear_php_program_prefix}
+      -ds a${php_pear_php_program_suffix}
   OUTPUT_VARIABLE output
   ERROR_VARIABLE output
   RESULT_VARIABLE result

cmake/sapi/apache2handler/CMakeLists.txt

@@ -22,9 +22,9 @@ with the `APACHE_ROOT` and `Apache_APXS_EXECUTABLE` variables.
 For example:
 
 ```cmake
-cmake -B php-build -DAPACHE2HANDLER=ON -DAPACHE_ROOT=/opt/apache2
+cmake -B php-build -DPHP_SAPI_APACHE2HANDLER=ON -DAPACHE_ROOT=/opt/apache2
 # or
-cmake -B php-build -DAPACHE2HANDLER=ON -DApache_EXECUTABLE=/opt/apache2/bin/apxs
+cmake -B php-build -DPHP_SAPI_APACHE2HANDLER=ON -DApache_EXECUTABLE=/opt/apache2/bin/apxs
 ```
 #]=============================================================================]