Skip to content

Commit 3846ed2

Browse files
petkpetk
committed
Merge branch 'PHP-8.3' into PHP-8.4
2 parents 76bc567 + 45bed5a commit 3846ed2

File tree

14 files changed

+54
-51
lines changed

14 files changed

+54
-51
lines changed

‎cmake/Zend/CMakeLists.txt‎

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ Zend Engine.
33
44
Targets:
55
6-
* OBJECT library 'zend' (ALIAS Zend::Zend) holds all Zend Engine objects and
6+
* OBJECT library 'php_zend' (ALIAS PHP::Zend) holds all Zend Engine objects and
77
compile properties.
88
99
Target properties:
1010
11-
CMake target properties for the Zend::Zend target:
11+
CMake target properties for the PHP::Zend target:
1212
1313
* VERSION
1414
Zend Engine version as defined in the Zend/zend.h file.
@@ -111,11 +111,11 @@ mark_as_advanced(PHP_ZEND_SIGNALS)
111111
# Add library.
112112
################################################################################
113113

114-
add_library(zend OBJECT)
115-
add_library(Zend::Zend ALIAS zend)
114+
add_library(php_zend OBJECT)
115+
add_library(PHP::Zend ALIAS php_zend)
116116

117117
target_sources(
118-
zend
118+
php_zend
119119
PRIVATE
120120
Optimizer/block_pass.c
121121
Optimizer/compact_literals.c
@@ -328,25 +328,25 @@ target_sources(
328328
$<$<NOT:$<PLATFORM_ID:Windows>>:${CMAKE_CURRENT_BINARY_DIR}/zend_config.h>
329329
)
330330

331-
target_link_libraries(zend PRIVATE PHP::config)
331+
target_link_libraries(php_zend PRIVATE PHP::config)
332332

333333
target_include_directories(
334-
zend
334+
php_zend
335335
INTERFACE
336336
${CMAKE_CURRENT_BINARY_DIR}
337337
${CMAKE_CURRENT_SOURCE_DIR}
338338
)
339339

340340
target_compile_definitions(
341-
zend
341+
php_zend
342342
PRIVATE
343343
ZEND_ENABLE_STATIC_TSRMLS_CACHE
344344
PUBLIC
345345
$<$<PLATFORM_ID:Windows>:LIBZEND_EXPORTS>
346346
)
347347

348348
set_target_properties(
349-
zend
349+
php_zend
350350
PROPERTIES
351351
VERSION ${PHP_ZEND_VERSION}
352352
ZEND_EXTENSION_API_NO ${PHP_ZEND_VERSION_EXTENSION_API_NO}
@@ -357,9 +357,9 @@ set_target_properties(
357357
# Add usage requirements to PHP interface targets.
358358
################################################################################
359359

360-
target_link_libraries(php_config INTERFACE $<COMPILE_ONLY:Zend::Zend>)
361-
target_link_libraries(php_sapi INTERFACE Zend::Zend)
362-
target_sources(php_sapi INTERFACE $<TARGET_OBJECTS:Zend::Zend>)
360+
target_link_libraries(php_config INTERFACE $<COMPILE_ONLY:PHP::Zend>)
361+
target_link_libraries(php_sapi INTERFACE PHP::Zend)
362+
target_sources(php_sapi INTERFACE $<TARGET_OBJECTS:PHP::Zend>)
363363

364364
################################################################################
365365
# TSRM (Thread Safe Resource Manager) is a separate directory in php-src as it
@@ -368,7 +368,7 @@ target_sources(php_sapi INTERFACE $<TARGET_OBJECTS:Zend::Zend>)
368368
################################################################################
369369

370370
target_sources(
371-
zend
371+
php_zend
372372
PRIVATE
373373
$<$<PLATFORM_ID:Windows>:${CMAKE_CURRENT_SOURCE_DIR}/../TSRM/tsrm_win32.c>
374374
${CMAKE_CURRENT_SOURCE_DIR}/../TSRM/TSRM.c
@@ -382,16 +382,19 @@ target_sources(
382382
)
383383

384384
target_include_directories(
385-
zend
385+
php_zend
386386
INTERFACE
387387
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../TSRM>
388388
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/${PHP_INCLUDE_PREFIX}/TSRM>
389389
)
390390

391-
target_compile_definitions(zend PUBLIC $<$<PLATFORM_ID:Windows>:TSRM_EXPORTS>)
391+
target_compile_definitions(
392+
php_zend
393+
PUBLIC $<$<PLATFORM_ID:Windows>:TSRM_EXPORTS>
394+
)
392395

393396
install(
394-
TARGETS zend
397+
TARGETS php_zend
395398
FILE_SET tsrm
396399
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PHP_INCLUDE_PREFIX}/TSRM
397400
)
@@ -502,7 +505,7 @@ php_search_libraries(
502505
HEADERS libproc.h
503506
LIBRARIES proc
504507
RESULT_VARIABLE PHP_ZEND_HAVE_PGRAB
505-
TARGET zend PRIVATE
508+
TARGET php_zend PRIVATE
506509
)
507510

508511
include(cmake/CheckAsmGoto.cmake)
@@ -564,7 +567,7 @@ if(NOT CMAKE_SYSTEM_NAME STREQUAL "Windows")
564567
endif()
565568

566569
install(
567-
TARGETS zend
570+
TARGETS php_zend
568571
ARCHIVE EXCLUDE_FROM_ALL
569572
FILE_SET HEADERS
570573
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PHP_INCLUDE_PREFIX}/Zend

‎cmake/Zend/cmake/Fibers.cmake‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ include(CMakePushCheckState)
1414

1515
# Create interface library for using Boost fiber assembly files and compile
1616
# options if available.
17-
add_library(zend_fibers INTERFACE)
18-
add_library(Zend::Fibers ALIAS zend_fibers)
19-
target_link_libraries(zend PRIVATE Zend::Fibers)
17+
add_library(php_zend_fibers INTERFACE)
18+
add_library(PHP::Zend::Fibers ALIAS php_zend_fibers)
19+
target_link_libraries(php_zend PRIVATE PHP::Zend::Fibers)
2020

2121
################################################################################
2222
# Check shadow stack.
@@ -59,7 +59,7 @@ function(_php_zend_fibers_shadow_stack_syscall)
5959
# Use compile definitions because ASM files can't see macro definitions from
6060
# the PHP configuration header (php_config.h/config.w32.h).
6161
target_compile_definitions(
62-
zend_fibers
62+
php_zend_fibers
6363
INTERFACE
6464
$<IF:$<BOOL:${PHP_ZEND_SHADOW_STACK_SYSCALL}>,SHADOW_STACK_SYSCALL=1,SHADOW_STACK_SYSCALL=0>
6565
)
@@ -174,7 +174,7 @@ block()
174174
if(PHP_ZEND_FIBER_ASM AND asm_file)
175175
message(CHECK_PASS "yes, Zend/asm/*.${asm_file}")
176176

177-
target_sources(zend_fibers INTERFACE ${asm_sources})
177+
target_sources(php_zend_fibers INTERFACE ${asm_sources})
178178

179179
_php_zend_fibers_shadow_stack_syscall()
180180
else()

‎cmake/Zend/cmake/GenerateGrammar.cmake‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ else()
1313
endif()
1414

1515
php_bison(
16-
zend_ini_parser
16+
php_zend_ini_parser
1717
zend_ini_parser.y
1818
${CMAKE_CURRENT_SOURCE_DIR}/zend_ini_parser.c
1919
HEADER
@@ -23,7 +23,7 @@ php_bison(
2323
)
2424

2525
php_bison(
26-
zend_language_parser
26+
php_zend_language_parser
2727
zend_language_parser.y
2828
${CMAKE_CURRENT_SOURCE_DIR}/zend_language_parser.c
2929
HEADER
@@ -75,19 +75,19 @@ block()
7575
CONTENT "${patch}"
7676
)
7777
add_custom_target(
78-
zend_language_parser_patch
78+
php_zend_language_parser_patch
7979
COMMAND ${CMAKE_COMMAND} -P CMakeFiles/Zend/PatchLanguageParser.cmake
80-
DEPENDS zend_language_parser
80+
DEPENDS php_zend_language_parser
8181
VERBATIM
8282
)
83-
add_dependencies(zend zend_language_parser_patch)
83+
add_dependencies(php_zend php_zend_language_parser_patch)
8484
endif()
8585
endblock()
8686

8787
include(PHP/Re2c)
8888

8989
php_re2c(
90-
zend_ini_scanner
90+
php_zend_ini_scanner
9191
zend_ini_scanner.l
9292
${CMAKE_CURRENT_SOURCE_DIR}/zend_ini_scanner.c
9393
HEADER ${CMAKE_CURRENT_SOURCE_DIR}/zend_ini_scanner_defs.h
@@ -102,7 +102,7 @@ php_re2c(
102102
)
103103

104104
php_re2c(
105-
zend_language_scanner
105+
php_zend_language_scanner
106106
zend_language_scanner.l
107107
${CMAKE_CURRENT_SOURCE_DIR}/zend_language_scanner.c
108108
HEADER ${CMAKE_CURRENT_SOURCE_DIR}/zend_language_scanner_defs.h

‎cmake/Zend/cmake/MaxExecutionTimers.cmake‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,12 @@ endif()
4949

5050
if(ZEND_MAX_EXECUTION_TIMERS)
5151
if(PHP_ZEND_HAVE_TIMER_CREATE_LIBRARY)
52-
target_link_libraries(zend PUBLIC ${PHP_ZEND_HAVE_TIMER_CREATE_LIBRARY})
52+
target_link_libraries(php_zend PUBLIC ${PHP_ZEND_HAVE_TIMER_CREATE_LIBRARY})
5353
endif()
5454

5555
# zend_config.h (or its parent php_config.h) isn't included in some files,
5656
# therefore also compilation definition is added.
57-
target_compile_definitions(zend PUBLIC ZEND_MAX_EXECUTION_TIMERS)
57+
target_compile_definitions(php_zend PUBLIC ZEND_MAX_EXECUTION_TIMERS)
5858

5959
message(CHECK_PASS "yes")
6060
else()

‎cmake/Zend/cmake/Signals.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ if(PHP_HAVE_SIGACTION AND PHP_ZEND_SIGNALS)
2222

2323
# zend_config.h (or its wrapper php_config.h) isn't included in some zend_*
2424
# files, therefore also compilation definition is added.
25-
target_compile_definitions(zend PUBLIC ZEND_SIGNALS)
25+
target_compile_definitions(php_zend PUBLIC ZEND_SIGNALS)
2626
else()
2727
message(CHECK_FAIL "no")
2828
set(ZEND_SIGNALS FALSE)

‎cmake/Zend/cmake/Version.cmake‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ block(PROPAGATE PHP_ZEND_VERSION PHP_ZEND_VERSION_LABEL)
2424
endblock()
2525

2626
# This is automatically executed with the project(Zend...) invocation.
27-
function(_zend_version_post_project)
27+
function(_php_zend_version_post_project)
2828
if(DEFINED PHP_ZEND_VERSION_MODULE_API_NO)
2929
return()
3030
endif()
@@ -58,4 +58,4 @@ function(_zend_version_post_project)
5858
PHP_ZEND_VERSION_MODULE_API_NO
5959
)
6060
endfunction()
61-
variable_watch(PHP_ZEND_DESCRIPTION _zend_version_post_project)
61+
variable_watch(PHP_ZEND_DESCRIPTION _php_zend_version_post_project)

‎cmake/cmake/Configuration.cmake‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -229,13 +229,13 @@ if(NOT PHP_EXTENSION_DIR)
229229
CACHE PHP_EXTENSION_DIR
230230
PROPERTY
231231
VALUE
232-
"${CMAKE_INSTALL_LIBDIR}/php/$<TARGET_PROPERTY:Zend::Zend,ZEND_MODULE_API_NO>$<$<BOOL:$<TARGET_PROPERTY:PHP::config,PHP_THREAD_SAFETY>>:-zts>$<$<BOOL:$<CONFIG>>:-$<CONFIG>>"
232+
"${CMAKE_INSTALL_LIBDIR}/php/$<TARGET_PROPERTY:PHP::Zend,ZEND_MODULE_API_NO>$<$<BOOL:$<TARGET_PROPERTY:PHP::config,PHP_THREAD_SAFETY>>:-zts>$<$<BOOL:$<CONFIG>>:-$<CONFIG>>"
233233
)
234234

235235
# This would resemble the PHP Autotools --with-layout=GNU:
236-
#set(extension_dir "${CMAKE_INSTALL_LIBDIR}/php/$<TARGET_PROPERTY:Zend::Zend,ZEND_MODULE_API_NO>$<$<BOOL:$<TARGET_PROPERTY:PHP::config,PHP_THREAD_SAFETY>>:-zts>$<$<CONFIG:Debug,DebugAssertions>:-debug>")
236+
#set(extension_dir "${CMAKE_INSTALL_LIBDIR}/php/$<TARGET_PROPERTY:PHP::Zend,ZEND_MODULE_API_NO>$<$<BOOL:$<TARGET_PROPERTY:PHP::config,PHP_THREAD_SAFETY>>:-zts>$<$<CONFIG:Debug,DebugAssertions>:-debug>")
237237
# This would resemble the PHP Autotools --with-layout=PHP (default):
238-
#set(extension_dir "${CMAKE_INSTALL_LIBDIR}/php/extensions/$<IF:$<CONFIG:Debug,DebugAssertions>,debug,no-debug>$<IF:$<BOOL:$<TARGET_PROPERTY:PHP::config,PHP_THREAD_SAFETY>>,-zts,-non-zts>-$<TARGET_PROPERTY:Zend::Zend,ZEND_MODULE_API_NO>")
238+
#set(extension_dir "${CMAKE_INSTALL_LIBDIR}/php/extensions/$<IF:$<CONFIG:Debug,DebugAssertions>,debug,no-debug>$<IF:$<BOOL:$<TARGET_PROPERTY:PHP::config,PHP_THREAD_SAFETY>>,-zts,-non-zts>-$<TARGET_PROPERTY:PHP::Zend,ZEND_MODULE_API_NO>")
239239
endif()
240240

241241
################################################################################

‎cmake/cmake/Summary.cmake‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,10 @@ function(_php_summary_preamble result)
5151
preamble
5252
)
5353

54-
if(TARGET Zend::Zend)
55-
get_target_property(zend_version Zend::Zend VERSION)
56-
get_target_property(zend_extension_api Zend::Zend ZEND_EXTENSION_API_NO)
57-
get_target_property(zend_module_api Zend::Zend ZEND_MODULE_API_NO)
54+
if(TARGET PHP::Zend)
55+
get_target_property(zend_version PHP::Zend VERSION)
56+
get_target_property(zend_extension_api PHP::Zend ZEND_EXTENSION_API_NO)
57+
get_target_property(zend_module_api PHP::Zend ZEND_MODULE_API_NO)
5858
_php_summary_preamble_add_item(
5959
"Zend Engine version"
6060
"${zend_version}"

‎cmake/ext/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ foreach(extension IN LISTS extensions)
7070

7171
set_property(GLOBAL APPEND PROPERTY PHP_EXTENSIONS ${extension})
7272

73-
add_dependencies(php_ext_${extension} Zend::Zend)
73+
add_dependencies(php_ext_${extension} PHP::Zend)
7474

7575
# Add usage requirements to PHP interface targets.
7676
# TODO: Should PHP_CLI extensions pass properties only to PHP_CLI SAPIs?

‎cmake/ext/standard/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ target_include_directories(
219219
target_compile_definitions(php_ext_standard PRIVATE ZEND_ENABLE_STATIC_TSRMLS_CACHE)
220220

221221
# The standard extension depends on the generated Zend language parser.
222-
add_dependencies(php_ext_standard Zend::Zend)
222+
add_dependencies(php_ext_standard PHP::Zend)
223223

224224
target_link_libraries(
225225
php_ext_standard

0 commit comments

Comments
 (0)