Skip to content

Commit d6d11cf

Browse files
committed
Merge branch 'PHP-8.4'
2 parents 6624e7b + 1592ba5 commit d6d11cf

File tree

2 files changed

+17
-9
lines changed

2 files changed

+17
-9
lines changed

cmake/cmake/Configuration.cmake

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,13 +139,21 @@ mark_as_advanced(PHP_FD_SETSIZE)
139139
option(PHP_VALGRIND "Enable the Valgrind support" OFF)
140140
mark_as_advanced(PHP_VALGRIND)
141141

142-
option(PHP_MEMORY_SANITIZER "Enable the memory sanitizer compiler options (clang only)" OFF)
142+
option(
143+
PHP_MEMORY_SANITIZER
144+
"Enable the memory sanitizer compiler options (clang only)"
145+
OFF
146+
)
143147
mark_as_advanced(PHP_MEMORY_SANITIZER)
144148

145149
option(PHP_ADDRESS_SANITIZER "Enable the address sanitizer compiler option" OFF)
146150
mark_as_advanced(PHP_ADDRESS_SANITIZER)
147151

148-
option(PHP_UNDEFINED_SANITIZER "Enable the undefined sanitizer compiler option" OFF)
152+
option(
153+
PHP_UNDEFINED_SANITIZER
154+
"Enable the undefined sanitizer compiler option"
155+
OFF
156+
)
149157
mark_as_advanced(PHP_UNDEFINED_SANITIZER)
150158

151159
option(PHP_GCOV "Enable GCOV code coverage and include GCOV symbols" OFF)

cmake/cmake/modules/PHP/Stubs/PHPStubsGenerator.cmake.in

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,16 @@ if(NOT stubs)
3030
endif()
3131

3232
execute_process(
33-
COMMAND
34-
${CMAKE_COMMAND}
35-
-E cmake_echo_color --blue --bold
36-
"Regenerating *_arginfo.h headers from *.stub.php sources"
33+
COMMAND
34+
${CMAKE_COMMAND}
35+
-E cmake_echo_color --blue --bold
36+
"Regenerating *_arginfo.h headers from *.stub.php sources"
3737
)
3838

3939
execute_process(
40-
COMMAND
41-
@PHP_COMMAND@ @PROJECT_BINARY_DIR@/CMakeFiles/php_stubs/gen_stub.php
42-
${stubs}
40+
COMMAND
41+
@PHP_COMMAND@ @PROJECT_BINARY_DIR@/CMakeFiles/php_stubs/gen_stub.php
42+
${stubs}
4343
)
4444

4545
# Ensure that *_arginfo.h headers are newer than their *.stub.php sources.

0 commit comments

Comments
 (0)