Skip to content

Commit 39015dc

Browse files
committed
Merge branch 'PHP-8.3' into PHP-8.4
2 parents d98c373 + 93155fe commit 39015dc

File tree

4 files changed

+237
-407
lines changed

4 files changed

+237
-407
lines changed

cmake/cmake/modules/PHP/ConfigureFile.cmake

Lines changed: 0 additions & 277 deletions
This file was deleted.

cmake/main/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -323,8 +323,8 @@ function(_php_main_configure_build_defs)
323323
CONTENT "${content}"
324324
)
325325

326-
# Regenerate file on the install step when using different installation
327-
# prefix at the 'cmake --install ... --prefix <install-prefix>' phase.
326+
# Regenerate file on the install step when using different installation prefix
327+
# at the 'cmake --install ... --prefix <install-prefix>' phase.
328328
string(CONFIGURE [[
329329
@code@
330330
configure_file(

0 commit comments

Comments
 (0)