Skip to content

Commit d75890e

Browse files
petkpetk
committed
Fix CS: Rename ZEND_* custom properties to PHP_ZEND_*
From this build system PoV, there is no separate/external Zend library here that needs a separate namespace. It is also much easier to understand PHP and external libraries like this.
1 parent 45bed5a commit d75890e

File tree

6 files changed

+20
-20
lines changed

6 files changed

+20
-20
lines changed

‎cmake/Zend/CMakeLists.txt‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,18 @@ CMake target properties for the PHP::Zend target:
1313
* VERSION
1414
Zend Engine version as defined in the Zend/zend.h file.
1515
16-
* ZEND_EXTENSION_API_NO
16+
* PHP_ZEND_EXTENSION_API_NO
1717
Custom target property with internal API version number for PHP extensions
1818
(dynamically loaded with the 'extension' INI directive). This is the
19-
ZEND_MODULE_API_NO number from the Zend/zend_modules.h and ensures that built
20-
extension is compatible with particular PHP build.
19+
ZEND_EXTENSION_API_NO number from the Zend/zend_extensions.h and ensures that
20+
built extension is compatible with particular PHP build.
2121
22-
* ZEND_MODULE_API_NO
22+
* PHP_ZEND_MODULE_API_NO
2323
Custom target property with internal API version number for Zend extensions in
2424
PHP (dynamically loaded with the 'zend_extension' INI directive), such as
25-
opcache, debuggers, profilers, etc. This is the ZEND_EXTENSION_API_NO number
26-
from the Zend/zend_extensions.h and ensures that built extension is compatible
27-
with particular PHP build.
25+
opcache, debuggers, profilers, etc. This is the ZEND_MODULE_API_NO number from
26+
the Zend/zend_modules.h and ensures that built extension is compatible with
27+
particular PHP build.
2828
#]=============================================================================]
2929

3030
message(STATUS "")
@@ -342,8 +342,8 @@ set_target_properties(
342342
php_zend
343343
PROPERTIES
344344
VERSION ${PHP_ZEND_VERSION}
345-
ZEND_EXTENSION_API_NO ${PHP_ZEND_VERSION_EXTENSION_API_NO}
346-
ZEND_MODULE_API_NO ${PHP_ZEND_VERSION_MODULE_API_NO}
345+
PHP_ZEND_EXTENSION_API_NO ${PHP_ZEND_VERSION_EXTENSION_API_NO}
346+
PHP_ZEND_MODULE_API_NO ${PHP_ZEND_VERSION_MODULE_API_NO}
347347
)
348348

349349
################################################################################

‎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:PHP::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,PHP_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:PHP::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,PHP_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:PHP::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,PHP_ZEND_MODULE_API_NO>")
239239
endif()
240240

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

‎cmake/cmake/Summary.cmake‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ function(_php_summary_preamble result)
5353

5454
if(TARGET PHP::Zend)
5555
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)
56+
get_target_property(zend_extension_api PHP::Zend PHP_ZEND_EXTENSION_API_NO)
57+
get_target_property(zend_module_api PHP::Zend PHP_ZEND_MODULE_API_NO)
5858
_php_summary_preamble_add_item(
5959
"Zend Engine version"
6060
"${zend_version}"

‎cmake/sapi/embed/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,8 @@ php_pkgconfig_generate_pc(
102102
PHP_THREAD_SAFETY "$<IF:$<BOOL:$<TARGET_PROPERTY:PHP::config,PHP_THREAD_SAFETY>>,yes,no>"
103103
PHP_EMBED_SAPI_NAME "$<GENEX_EVAL:$<TARGET_PROPERTY:php_sapi_embed_shared,OUTPUT_NAME>>"
104104
PHP_API_VERSION "${PHP_API_VERSION}"
105-
PHP_ZEND_EXTENSION_API_NO "$<TARGET_PROPERTY:PHP::Zend,ZEND_EXTENSION_API_NO>"
106-
PHP_ZEND_MODULE_API_NO "$<TARGET_PROPERTY:PHP::Zend,ZEND_MODULE_API_NO>"
105+
PHP_ZEND_EXTENSION_API_NO "$<TARGET_PROPERTY:PHP::Zend,PHP_ZEND_EXTENSION_API_NO>"
106+
PHP_ZEND_MODULE_API_NO "$<TARGET_PROPERTY:PHP::Zend,PHP_ZEND_MODULE_API_NO>"
107107
)
108108

109109
install(

‎cmake/sapi/phpdbg/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -297,8 +297,8 @@ if(TARGET php_sapi_phpdbg_shared)
297297
PHP_THREAD_SAFETY "$<IF:$<BOOL:$<TARGET_PROPERTY:PHP::config,PHP_THREAD_SAFETY>>,yes,no>"
298298
PHP_PHPDBG_SAPI_NAME "$<GENEX_EVAL:$<TARGET_PROPERTY:php_sapi_phpdbg_shared,OUTPUT_NAME>>"
299299
PHP_API_VERSION "${PHP_API_VERSION}"
300-
PHP_ZEND_EXTENSION_API_NO "$<TARGET_PROPERTY:PHP::Zend,ZEND_EXTENSION_API_NO>"
301-
PHP_ZEND_MODULE_API_NO "$<TARGET_PROPERTY:PHP::Zend,ZEND_MODULE_API_NO>"
300+
PHP_ZEND_EXTENSION_API_NO "$<TARGET_PROPERTY:PHP::Zend,PHP_ZEND_EXTENSION_API_NO>"
301+
PHP_ZEND_MODULE_API_NO "$<TARGET_PROPERTY:PHP::Zend,PHP_ZEND_MODULE_API_NO>"
302302
)
303303

304304
install(

‎cmake/scripts/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ php_pkgconfig_generate_pc(
2121
PHP_DEBUG "$<IF:$<CONFIG:Debug,DebugAssertions>,yes,no>"
2222
PHP_THREAD_SAFETY "$<IF:$<BOOL:$<TARGET_PROPERTY:PHP::config,PHP_THREAD_SAFETY>>,yes,no>"
2323
PHP_API_VERSION "${PHP_API_VERSION}"
24-
PHP_ZEND_EXTENSION_API_NO "$<TARGET_PROPERTY:PHP::Zend,ZEND_EXTENSION_API_NO>"
25-
PHP_ZEND_MODULE_API_NO "$<TARGET_PROPERTY:PHP::Zend,ZEND_MODULE_API_NO>"
24+
PHP_ZEND_EXTENSION_API_NO "$<TARGET_PROPERTY:PHP::Zend,PHP_ZEND_EXTENSION_API_NO>"
25+
PHP_ZEND_MODULE_API_NO "$<TARGET_PROPERTY:PHP::Zend,PHP_ZEND_MODULE_API_NO>"
2626
)
2727

2828
install(

0 commit comments

Comments
 (0)