Skip to content

Commit a1ce536

Browse files
committed
Merge branch 'PHP-8.3' into PHP-8.4
2 parents be62acf + 7ad5b70 commit a1ce536

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

bin/init.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,8 @@ if test -z "$branch"; then
143143
branch=master
144144
;;
145145
*)
146-
echo "Unknown branch. Please, add the '--branch' option" >&2
146+
echo "Unknown php-src branch $branch. Branch can be adjusted with:" >&2
147+
echo "'--branch PHP-X.Y' option" >&2
147148
exit 1
148149
;;
149150
esac

cmake/cmake/modules/PHP/AddCustomCommand.cmake

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,9 @@ php_add_custom_command(
3131
```
3232
3333
It acts similar to `add_custom_command()` and `add_custom_target()`, except that
34-
the DEPENDS argument doesn't add dependencies among targets but instead checks
35-
their timestamps manually and executes the PHP_COMMAND only when needed.
34+
when PHP is not found on the system, the DEPENDS argument doesn't add
35+
dependencies among targets but instead checks their timestamps manually and
36+
executes the PHP_COMMAND only when needed.
3637
3738
```cmake
3839
php_add_custom_command(
@@ -69,8 +70,6 @@ function(php_add_custom_command)
6970
message(FATAL_ERROR "1st argument (target name) is missing.")
7071
endif()
7172

72-
set(targetName ${ARGV0})
73-
7473
if(parsed_VERBATIM)
7574
set(verbatim VERBATIM)
7675
else()
@@ -97,6 +96,8 @@ function(php_add_custom_command)
9796
return()
9897
endif()
9998

99+
set(targetName ${ARGV0})
100+
100101
add_custom_target(
101102
${targetName} ALL
102103
COMMAND ${CMAKE_COMMAND}

0 commit comments

Comments
 (0)