From 454c987f7cb8c640269a1d7e80461a750f8fe90c Mon Sep 17 00:00:00 2001 From: Peter Kokot Date: Mon, 16 Dec 2024 14:00:29 +0100 Subject: [PATCH] Improve naming conventions In CMake there is common issue of naming collisions in extreme cases. There is issue opened upstream about this at: https://gitlab.kitware.com/cmake/cmake/-/issues/22687 Possible target name and cache variable names collisions can happen: - When some project is added with `FetchContent`, as an external project, via `add_subdirectory()` or similar - or the other way around, if PHP would be added via such mechanisms - If some extension would be named `config`, it would collide with global PHP target `php_config` (aliased `PHP::config`). This follows recent PHP SAPI target renames and renames target names for PHP extensions from: `php_` (aliased `PHP::`) to: `php_ext_` (aliased `PHP::ext::`) This adds abbreviated letters to target names to better organize them in various scenarios, while still not increasing usage complexity too much. Possible further adjustments following up... --- cmake/cmake/Testing.cmake | 4 +- cmake/cmake/modules/FindRE2C.cmake | 1 + cmake/cmake/modules/PHP/Extensions.cmake | 54 +++++++------- cmake/cmake/modules/PHP/FeatureSummary.cmake | 14 ++-- cmake/ext/CMakeLists.txt | 24 +++---- cmake/ext/bcmath/CMakeLists.txt | 8 +-- cmake/ext/bz2/CMakeLists.txt | 10 +-- cmake/ext/calendar/CMakeLists.txt | 6 +- cmake/ext/com_dotnet/CMakeLists.txt | 12 ++-- cmake/ext/ctype/CMakeLists.txt | 6 +- cmake/ext/curl/CMakeLists.txt | 10 +-- cmake/ext/date/CMakeLists.txt | 8 +-- cmake/ext/date/lib/CMakeLists.txt | 4 +- cmake/ext/dba/CMakeLists.txt | 56 +++++++-------- cmake/ext/dl_test/CMakeLists.txt | 6 +- cmake/ext/dom/CMakeLists.txt | 12 ++-- cmake/ext/enchant/CMakeLists.txt | 8 +-- cmake/ext/exif/CMakeLists.txt | 10 +-- cmake/ext/ffi/CMakeLists.txt | 10 +-- cmake/ext/fileinfo/CMakeLists.txt | 14 ++-- cmake/ext/filter/CMakeLists.txt | 10 +-- cmake/ext/ftp/CMakeLists.txt | 8 +-- cmake/ext/gd/CMakeLists.txt | 52 +++++++------- cmake/ext/gettext/CMakeLists.txt | 8 +-- cmake/ext/gmp/CMakeLists.txt | 12 ++-- cmake/ext/hash/CMakeLists.txt | 16 ++--- cmake/ext/iconv/CMakeLists.txt | 10 +-- cmake/ext/imap/CMakeLists.txt | 14 ++-- cmake/ext/intl/CMakeLists.txt | 24 +++---- cmake/ext/json/CMakeLists.txt | 14 ++-- cmake/ext/ldap/CMakeLists.txt | 12 ++-- cmake/ext/libxml/CMakeLists.txt | 10 +-- cmake/ext/mbstring/CMakeLists.txt | 20 +++--- cmake/ext/mbstring/libmbfl/CMakeLists.txt | 2 +- cmake/ext/mysqli/CMakeLists.txt | 10 +-- cmake/ext/mysqlnd/CMakeLists.txt | 18 ++--- cmake/ext/oci8/CMakeLists.txt | 10 +-- cmake/ext/odbc/CMakeLists.txt | 10 +-- cmake/ext/opcache/CMakeLists.txt | 30 ++++---- cmake/ext/openssl/CMakeLists.txt | 12 ++-- cmake/ext/pcntl/CMakeLists.txt | 12 ++-- cmake/ext/pcre/CMakeLists.txt | 16 ++--- cmake/ext/pdo/CMakeLists.txt | 10 +-- cmake/ext/pdo_dblib/CMakeLists.txt | 14 ++-- cmake/ext/pdo_firebird/CMakeLists.txt | 16 ++--- cmake/ext/pdo_mysql/CMakeLists.txt | 16 ++--- cmake/ext/pdo_oci/CMakeLists.txt | 10 +-- cmake/ext/pdo_odbc/CMakeLists.txt | 12 ++-- cmake/ext/pdo_pgsql/CMakeLists.txt | 12 ++-- cmake/ext/pdo_sqlite/CMakeLists.txt | 12 ++-- cmake/ext/pgsql/CMakeLists.txt | 14 ++-- cmake/ext/phar/CMakeLists.txt | 24 +++---- cmake/ext/posix/CMakeLists.txt | 8 +-- cmake/ext/pspell/CMakeLists.txt | 10 +-- cmake/ext/random/CMakeLists.txt | 6 +- cmake/ext/readline/CMakeLists.txt | 18 ++--- cmake/ext/reflection/CMakeLists.txt | 10 +-- cmake/ext/session/CMakeLists.txt | 20 +++--- cmake/ext/shmop/CMakeLists.txt | 6 +- cmake/ext/simplexml/CMakeLists.txt | 12 ++-- cmake/ext/skeleton/CMakeLists.txt.in | 18 ++--- .../ext/skeleton/cmake/modules/FindPHP.cmake | 2 +- cmake/ext/snmp/CMakeLists.txt | 10 +-- cmake/ext/soap/CMakeLists.txt | 14 ++-- cmake/ext/sockets/CMakeLists.txt | 10 +-- cmake/ext/sodium/CMakeLists.txt | 12 ++-- cmake/ext/spl/CMakeLists.txt | 10 +-- cmake/ext/sqlite3/CMakeLists.txt | 10 +-- cmake/ext/standard/CMakeLists.txt | 72 +++++++++---------- cmake/ext/sysvmsg/CMakeLists.txt | 6 +- cmake/ext/sysvsem/CMakeLists.txt | 6 +- cmake/ext/sysvshm/CMakeLists.txt | 6 +- cmake/ext/tidy/CMakeLists.txt | 12 ++-- cmake/ext/tokenizer/CMakeLists.txt | 12 ++-- cmake/ext/xml/CMakeLists.txt | 18 ++--- cmake/ext/xmlreader/CMakeLists.txt | 14 ++-- cmake/ext/xmlwriter/CMakeLists.txt | 12 ++-- cmake/ext/xsl/CMakeLists.txt | 20 +++--- cmake/ext/zend_test/CMakeLists.txt | 10 +-- cmake/ext/zip/CMakeLists.txt | 10 +-- cmake/ext/zlib/CMakeLists.txt | 10 +-- cmake/main/CMakeLists.txt | 6 +- cmake/sapi/cli/CMakeLists.txt | 2 +- 83 files changed, 570 insertions(+), 569 deletions(-) diff --git a/cmake/cmake/Testing.cmake b/cmake/cmake/Testing.cmake index 171f031d9..7de07a9cc 100644 --- a/cmake/cmake/Testing.cmake +++ b/cmake/cmake/Testing.cmake @@ -18,9 +18,9 @@ block() get_property(extensions GLOBAL PROPERTY PHP_EXTENSIONS) foreach(extension IN LISTS extensions) - get_target_property(type php_${extension} TYPE) + get_target_property(type php_ext_${extension} TYPE) if(type MATCHES "^(MODULE|SHARED)_LIBRARY$") - get_target_property(isZendExtension php_${extension} PHP_ZEND_EXTENSION) + get_target_property(isZendExtension php_ext_${extension} PHP_ZEND_EXTENSION) if(isZendExtension) list(APPEND options -d zend_extension=${extension}) elseif(NOT extension STREQUAL "dl_test") diff --git a/cmake/cmake/modules/FindRE2C.cmake b/cmake/cmake/modules/FindRE2C.cmake index 640a33a96..9649deac3 100644 --- a/cmake/cmake/modules/FindRE2C.cmake +++ b/cmake/cmake/modules/FindRE2C.cmake @@ -157,6 +157,7 @@ if(RE2C_ENABLE_DOWNLOAD AND (NOT RE2C_EXECUTABLE OR NOT _re2c_version_valid)) URL https://github.com/skvadrik/re2c/archive/refs/tags/${RE2C_VERSION}.tar.gz ) + message(STATUS "Downloading RE2C") FetchContent_MakeAvailable(RE2C) # Set executable to re2c target name. diff --git a/cmake/cmake/modules/PHP/Extensions.cmake b/cmake/cmake/modules/PHP/Extensions.cmake index 3ea6c7fd4..8770e7cc7 100644 --- a/cmake/cmake/modules/PHP/Extensions.cmake +++ b/cmake/cmake/modules/PHP/Extensions.cmake @@ -45,7 +45,7 @@ https://bugs.php.net/53141 capabilities. ```cmake - set_target_properties(php_ PROPERTIES PHP_ZEND_EXTENSION TRUE) + set_target_properties(php_ext_ PROPERTIES PHP_ZEND_EXTENSION TRUE) ``` * `PHP_EXTENSION__DEPS` @@ -195,9 +195,9 @@ function(_php_extensions_parse_dependencies extension result) # Command invocation: "add_dependencies[ \t]*\\(" # Target name: - "[ \t\r\n]*php_${extension}[ \t\r\n]+" + "[ \t\r\n]*php_ext_${extension}[ \t\r\n]+" # Dependencies: - "[\"]?(php_[a-zA-Z0-9_; \t\r\n]+)" + "[\"]?(php_ext_[a-zA-Z0-9_; \t\r\n]+)" ) string(REGEX MATCHALL "${regex}" matches "${content}") @@ -209,7 +209,7 @@ function(_php_extensions_parse_dependencies extension result) if(CMAKE_MATCH_1) string(STRIP "${CMAKE_MATCH_1}" dependencies) string(REPLACE " " ";" dependencies "${dependencies}") - list(TRANSFORM dependencies REPLACE "^php_" "") + list(TRANSFORM dependencies REPLACE "^php_ext_" "") list(APPEND allDependencies ${dependencies}) endif() endif() @@ -364,17 +364,17 @@ endfunction() # Postconfigure extension right after it has been configured. function(php_extensions_postconfigure extension) - if(NOT TARGET php_${extension}) + if(NOT TARGET php_ext_${extension}) return() endif() # If extension is enabled, enable also all its dependencies. get_target_property( dependencies - php_${extension} + php_ext_${extension} MANUALLY_ADDED_DEPENDENCIES ) - list(TRANSFORM dependencies REPLACE "^php_" "") + list(TRANSFORM dependencies REPLACE "^php_ext_" "") get_property(alwaysEnabledExtensions GLOBAL PROPERTY PHP_ALWAYS_ENABLED_EXTENSIONS) get_property(allExtensions GLOBAL PROPERTY PHP_ALL_EXTENSIONS) @@ -409,18 +409,18 @@ function(php_extensions_postconfigure extension) endif() endforeach() - if(NOT TARGET PHP::${extension}) - add_library(PHP::${extension} ALIAS php_${extension}) + if(NOT TARGET PHP::ext::${extension}) + add_library(PHP::ext::${extension} ALIAS php_ext_${extension}) endif() # Set target output filename to "". - get_target_property(output php_${extension} OUTPUT_NAME) + get_target_property(output php_ext_${extension} OUTPUT_NAME) if(NOT output) - set_property(TARGET php_${extension} PROPERTY OUTPUT_NAME ${extension}) + set_property(TARGET php_ext_${extension} PROPERTY OUTPUT_NAME ${extension}) endif() # Specify extension's default installation rules. - get_target_property(sets php_${extension} INTERFACE_HEADER_SETS) + get_target_property(sets php_ext_${extension} INTERFACE_HEADER_SETS) set(fileSets "") foreach(set IN LISTS sets) list( @@ -433,7 +433,7 @@ function(php_extensions_postconfigure extension) ) endforeach() install( - TARGETS php_${extension} + TARGETS php_ext_${extension} ARCHIVE EXCLUDE_FROM_ALL RUNTIME DESTINATION ${PHP_EXTENSION_DIR} @@ -443,24 +443,24 @@ function(php_extensions_postconfigure extension) ) # Configure shared extension. - get_target_property(type php_${extension} TYPE) + get_target_property(type php_ext_${extension} TYPE) if(NOT type MATCHES "^(MODULE|SHARED)_LIBRARY$") return() endif() - target_compile_definitions(php_${extension} PRIVATE ZEND_COMPILE_DL_EXT) + target_compile_definitions(php_ext_${extension} PRIVATE ZEND_COMPILE_DL_EXT) set_target_properties( - php_${extension} + php_ext_${extension} PROPERTIES POSITION_INDEPENDENT_CODE ON ) # Set build-phase location for shared extensions. - get_target_property(location php_${extension} LIBRARY_OUTPUT_DIRECTORY) + get_target_property(location php_ext_${extension} LIBRARY_OUTPUT_DIRECTORY) if(NOT location) set_property( - TARGET php_${extension} + TARGET php_ext_${extension} PROPERTY LIBRARY_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/modules" ) endif() @@ -471,13 +471,13 @@ endfunction() function(php_extensions_configure_headers) get_property(extensions GLOBAL PROPERTY PHP_EXTENSIONS) foreach(extension IN LISTS extensions) - if(NOT TARGET php_${extension}) + if(NOT TARGET php_ext_${extension}) continue() endif() string(TOUPPER "COMPILE_DL_${extension}" macro) - get_target_property(type php_${extension} TYPE) + get_target_property(type php_ext_${extension} TYPE) if(type MATCHES "^(MODULE|SHARED)_LIBRARY$") set(${macro} TRUE) endif() @@ -492,7 +492,7 @@ function(php_extensions_configure_headers) "#cmakedefine ${macro} 1\n" ) - get_target_property(binaryDir php_${extension} BINARY_DIR) + get_target_property(binaryDir php_ext_${extension} BINARY_DIR) set(current "") if(EXISTS ${binaryDir}/config.h) file(READ ${binaryDir}/config.h current) @@ -511,13 +511,13 @@ function(_php_extensions_validate) list(TRANSFORM extensions REPLACE "${CMAKE_CURRENT_SOURCE_DIR}/" "") foreach(extension IN LISTS extensions) - if(NOT TARGET php_${extension}) + if(NOT TARGET php_ext_${extension}) continue() endif() get_target_property( dependencies - php_${extension} + php_ext_${extension} MANUALLY_ADDED_DEPENDENCIES ) @@ -525,7 +525,7 @@ function(_php_extensions_validate) continue() endif() - list(TRANSFORM dependencies REPLACE "^php_" "") + list(TRANSFORM dependencies REPLACE "^php_ext_" "") get_property(allExtensions GLOBAL PROPERTY PHP_ALL_EXTENSIONS) @@ -535,7 +535,7 @@ function(_php_extensions_validate) continue() endif() - if(NOT TARGET php_${dependency} OR NOT dependency IN_LIST extensions) + if(NOT TARGET php_ext_${dependency} OR NOT dependency IN_LIST extensions) string(TOUPPER "${dependency}" dependencyUpper) message( SEND_ERROR @@ -546,8 +546,8 @@ function(_php_extensions_validate) ) endif() - get_target_property(dependencyType php_${dependency} TYPE) - get_target_property(extensionType php_${extension} TYPE) + get_target_property(dependencyType php_ext_${dependency} TYPE) + get_target_property(extensionType php_ext_${extension} TYPE) if( dependencyType MATCHES "^(MODULE|SHARED)_LIBRARY$" diff --git a/cmake/cmake/modules/PHP/FeatureSummary.cmake b/cmake/cmake/modules/PHP/FeatureSummary.cmake index 19bcf9929..435a106e0 100644 --- a/cmake/cmake/modules/PHP/FeatureSummary.cmake +++ b/cmake/cmake/modules/PHP/FeatureSummary.cmake @@ -161,7 +161,7 @@ function(php_feature_summary) string(PREPEND item " * ") if(feature MATCHES "^ext/([^ ]+)$") if(CMAKE_MATCH_1) - get_target_property(type php_${CMAKE_MATCH_1} TYPE) + get_target_property(type php_ext_${CMAKE_MATCH_1} TYPE) if(type MATCHES "^(MODULE|SHARED)_LIBRARY$") string(APPEND item " (shared)") endif() @@ -207,13 +207,13 @@ function(php_feature_summary) get_property(extensions GLOBAL PROPERTY PHP_EXTENSIONS) foreach(extension IN LISTS extensions) - if(NOT TARGET php_${extension}) + if(NOT TARGET php_ext_${extension}) continue() endif() get_target_property( dependencies - php_${extension} + php_ext_${extension} MANUALLY_ADDED_DEPENDENCIES ) @@ -221,7 +221,7 @@ function(php_feature_summary) continue() endif() - list(TRANSFORM dependencies REPLACE "^php_" "") + list(TRANSFORM dependencies REPLACE "^php_ext_" "") get_property(allExtensions GLOBAL PROPERTY PHP_ALL_EXTENSIONS) @@ -231,14 +231,14 @@ function(php_feature_summary) continue() endif() - if(NOT TARGET php_${dependency} OR NOT dependency IN_LIST extensions) + if(NOT TARGET php_ext_${dependency} OR NOT dependency IN_LIST extensions) list(APPEND missingExtensions ${dependency}) list(APPEND _phpFeatureSummaryReason_${dependency} ${extension}) continue() endif() - get_target_property(dependencyType php_${dependency} TYPE) - get_target_property(extensionType php_${extension} TYPE) + get_target_property(dependencyType php_ext_${dependency} TYPE) + get_target_property(extensionType php_ext_${extension} TYPE) if( dependencyType MATCHES "^(MODULE|SHARED)_LIBRARY$" diff --git a/cmake/ext/CMakeLists.txt b/cmake/ext/CMakeLists.txt index b9ff4c659..b189492b0 100644 --- a/cmake/ext/CMakeLists.txt +++ b/cmake/ext/CMakeLists.txt @@ -62,7 +62,7 @@ foreach(extension IN LISTS extensions) php_extensions_postconfigure("${extension}") list(POP_BACK CMAKE_MESSAGE_INDENT) - if(NOT TARGET php_${extension}) + if(NOT TARGET php_ext_${extension}) message(CHECK_FAIL "disabled") list(POP_BACK CMAKE_MESSAGE_CONTEXT) continue() @@ -70,55 +70,55 @@ foreach(extension IN LISTS extensions) set_property(GLOBAL APPEND PROPERTY PHP_EXTENSIONS ${extension}) - add_dependencies(php_${extension} Zend::Zend) + add_dependencies(php_ext_${extension} Zend::Zend) # Add usage requirements to PHP interface targets. # TODO: Should PHP_CLI extensions pass properties only to PHP_CLI SAPIs? - get_target_property(type php_${extension} TYPE) + get_target_property(type php_ext_${extension} TYPE) if(NOT type MATCHES "^(MODULE|SHARED)_LIBRARY$") target_compile_definitions( php_config INTERFACE - $ + $ ) target_compile_options( php_config INTERFACE - $ + $ ) target_compile_features( php_config INTERFACE - $ + $ ) target_include_directories( php_config INTERFACE - $ - $ + $ + $ ) target_link_libraries( php_sapi INTERFACE - $>>,$<$>:PHP::${extension}>,PHP::${extension}> + $>>,$<$>:PHP::ext::${extension}>,PHP::ext::${extension}> ) target_sources( php_sapi INTERFACE - $>>,$<$>:$>,$> + $>>,$<$>:$>,$> ) endif() - target_link_libraries(php_${extension} PRIVATE PHP::config) + target_link_libraries(php_ext_${extension} PRIVATE PHP::config) # Add configuration compile options before the extension compile options. target_compile_options( - php_${extension} + php_ext_${extension} BEFORE PRIVATE $ ) diff --git a/cmake/ext/bcmath/CMakeLists.txt b/cmake/ext/bcmath/CMakeLists.txt index 843f504be..b901f618f 100644 --- a/cmake/ext/bcmath/CMakeLists.txt +++ b/cmake/ext/bcmath/CMakeLists.txt @@ -49,13 +49,13 @@ if(NOT EXT_BCMATH) endif() if(EXT_BCMATH_SHARED) - add_library(php_bcmath SHARED) + add_library(php_ext_bcmath SHARED) else() - add_library(php_bcmath) + add_library(php_ext_bcmath) endif() target_sources( - php_bcmath + php_ext_bcmath PRIVATE bcmath.c bcmath.stub.php @@ -82,7 +82,7 @@ target_sources( libbcmath/src/zero.c ) -target_compile_definitions(php_bcmath PRIVATE ZEND_ENABLE_STATIC_TSRMLS_CACHE) +target_compile_definitions(php_ext_bcmath PRIVATE ZEND_ENABLE_STATIC_TSRMLS_CACHE) set(HAVE_BCMATH TRUE) diff --git a/cmake/ext/bz2/CMakeLists.txt b/cmake/ext/bz2/CMakeLists.txt index 40a981285..af0a07279 100644 --- a/cmake/ext/bz2/CMakeLists.txt +++ b/cmake/ext/bz2/CMakeLists.txt @@ -51,13 +51,13 @@ if(NOT EXT_BZ2) endif() if(EXT_BZ2_SHARED) - add_library(php_bz2 SHARED) + add_library(php_ext_bz2 SHARED) else() - add_library(php_bz2) + add_library(php_ext_bz2) endif() target_sources( - php_bz2 + php_ext_bz2 PRIVATE bz2_filter.c bz2.c @@ -65,7 +65,7 @@ target_sources( ) target_compile_definitions( - php_bz2 + php_ext_bz2 PRIVATE $<$,$,MODULE_LIBRARY;SHARED_LIBRARY>>:PHP_BZ2_EXPORTS> ) @@ -79,7 +79,7 @@ set_package_properties( ) # Link with PUBLIC scope if include directories are on non-standard places. -target_link_libraries(php_bz2 PUBLIC BZip2::BZip2) +target_link_libraries(php_ext_bz2 PUBLIC BZip2::BZip2) # Sanity check. if(TARGET BZip2::BZip2) diff --git a/cmake/ext/calendar/CMakeLists.txt b/cmake/ext/calendar/CMakeLists.txt index 4259c1202..7e49be52f 100644 --- a/cmake/ext/calendar/CMakeLists.txt +++ b/cmake/ext/calendar/CMakeLists.txt @@ -49,13 +49,13 @@ if(NOT EXT_CALENDAR) endif() if(EXT_CALENDAR_SHARED) - add_library(php_calendar SHARED) + add_library(php_ext_calendar SHARED) else() - add_library(php_calendar) + add_library(php_ext_calendar) endif() target_sources( - php_calendar + php_ext_calendar PRIVATE cal_unix.c calendar.c diff --git a/cmake/ext/com_dotnet/CMakeLists.txt b/cmake/ext/com_dotnet/CMakeLists.txt index 2a724a568..d57646154 100644 --- a/cmake/ext/com_dotnet/CMakeLists.txt +++ b/cmake/ext/com_dotnet/CMakeLists.txt @@ -24,7 +24,7 @@ Build extension as shared. #]=============================================================================] project( - PhpExtensionBz2 + PhpExtensionComDotnet LANGUAGES C ) @@ -57,13 +57,13 @@ if(NOT EXT_COM_DOTNET) endif() if(EXT_COM_DOTNET_SHARED) - add_library(php_com_dotnet SHARED) + add_library(php_ext_com_dotnet SHARED) else() - add_library(php_com_dotnet) + add_library(php_ext_com_dotnet) endif() target_sources( - php_com_dotnet + php_ext_com_dotnet PRIVATE com_com.c com_dotnet.c @@ -82,12 +82,12 @@ target_sources( ) target_compile_definitions( - php_com_dotnet + php_ext_com_dotnet PRIVATE ZEND_ENABLE_STATIC_TSRMLS_CACHE ) -target_link_libraries(php_com_dotnet PRIVATE oleaut32) +target_link_libraries(php_ext_com_dotnet PRIVATE oleaut32) check_include_file(mscoree.h HAVE_MSCOREE_H) diff --git a/cmake/ext/ctype/CMakeLists.txt b/cmake/ext/ctype/CMakeLists.txt index 9c9e351e7..36b9e26a4 100644 --- a/cmake/ext/ctype/CMakeLists.txt +++ b/cmake/ext/ctype/CMakeLists.txt @@ -50,13 +50,13 @@ if(NOT EXT_CTYPE) endif() if(EXT_CTYPE_SHARED) - add_library(php_ctype SHARED) + add_library(php_ext_ctype SHARED) else() - add_library(php_ctype) + add_library(php_ext_ctype) endif() target_sources( - php_ctype + php_ext_ctype PRIVATE ctype.c ctype.stub.php diff --git a/cmake/ext/curl/CMakeLists.txt b/cmake/ext/curl/CMakeLists.txt index 253a9c676..823addb25 100644 --- a/cmake/ext/curl/CMakeLists.txt +++ b/cmake/ext/curl/CMakeLists.txt @@ -53,13 +53,13 @@ if(NOT EXT_CURL) endif() if(EXT_CURL_SHARED) - add_library(php_curl SHARED) + add_library(php_ext_curl SHARED) else() - add_library(php_curl) + add_library(php_ext_curl) endif() target_sources( - php_curl + php_ext_curl PRIVATE curl_file.c curl_file.stub.php @@ -81,7 +81,7 @@ set_package_properties( PURPOSE "Necessary to enable the curl extension." ) -target_link_libraries(php_curl PRIVATE CURL::libcurl) +target_link_libraries(php_ext_curl PRIVATE CURL::libcurl) # Check whether to link against OpenSSL to have crypto locking callbacks when # thread safety is enabled. If libcurl is linked against OpenSSL 1.1 or newer, @@ -151,7 +151,7 @@ if(PHP_THREAD_SAFETY AND CURL_SSL_FOUND) PURPOSE "Necessary for crypto locking callbacks in the curl extension." ) - target_link_libraries(php_curl PRIVATE OpenSSL::Crypto) + target_link_libraries(php_ext_curl PRIVATE OpenSSL::Crypto) if(TARGET OpenSSL::Crypto) cmake_push_check_state(RESET) diff --git a/cmake/ext/date/CMakeLists.txt b/cmake/ext/date/CMakeLists.txt index 111a44b5b..ef64e97f5 100644 --- a/cmake/ext/date/CMakeLists.txt +++ b/cmake/ext/date/CMakeLists.txt @@ -21,12 +21,12 @@ add_feature_info( "date and time" ) -add_library(php_date OBJECT) +add_library(php_ext_date OBJECT) set(phpDateSources php_date.c) target_sources( - php_date + php_ext_date PRIVATE ${phpDateSources} php_date.stub.php @@ -42,13 +42,13 @@ set_source_files_properties( ) target_compile_options( - php_date + php_ext_date PRIVATE $<$:/wd4244> ) # Configure timelib. -set(TIMELIB_TARGET php_date) +set(TIMELIB_TARGET php_ext_date) add_subdirectory(lib) set(HAVE_TIMELIB_CONFIG_H TRUE) diff --git a/cmake/ext/date/lib/CMakeLists.txt b/cmake/ext/date/lib/CMakeLists.txt index 5f24c32e7..3afe26fda 100644 --- a/cmake/ext/date/lib/CMakeLists.txt +++ b/cmake/ext/date/lib/CMakeLists.txt @@ -8,14 +8,14 @@ Simplified CMake-based build system for the timelib library. Adding timelib with `add_subdirectory()`: ```cmake -set(TIMELIB_TARGET php_date) +set(TIMELIB_TARGET php_ext_date) add_subdirectory(lib) ``` #]=============================================================================] cmake_minimum_required(VERSION 3.25...3.31) -project(Timelib LANGUAGES C) +project(timelib LANGUAGES C) include(CheckIncludeFile) diff --git a/cmake/ext/dba/CMakeLists.txt b/cmake/ext/dba/CMakeLists.txt index fb11a9428..bd1583977 100644 --- a/cmake/ext/dba/CMakeLists.txt +++ b/cmake/ext/dba/CMakeLists.txt @@ -315,25 +315,25 @@ if(NOT EXT_DBA) endif() if(EXT_DBA_SHARED) - add_library(php_dba SHARED) + add_library(php_ext_dba SHARED) else() - add_library(php_dba) + add_library(php_ext_dba) endif() target_sources( - php_dba + php_ext_dba PRIVATE dba.c dba.stub.php ) -target_compile_definitions(php_dba PRIVATE ZEND_ENABLE_STATIC_TSRMLS_CACHE) +target_compile_definitions(php_ext_dba PRIVATE ZEND_ENABLE_STATIC_TSRMLS_CACHE) ################################################################################ # Constant databases (cdb). ################################################################################ if(EXT_DBA_CDB) - target_sources(php_dba PRIVATE dba_cdb.c) + target_sources(php_ext_dba PRIVATE dba_cdb.c) set(DBA_CDB TRUE) if(EXT_DBA_CDB_EXTERNAL) @@ -344,7 +344,7 @@ if(EXT_DBA_CDB) TYPE REQUIRED PURPOSE "Necessary to enable the cdb handler in the dba extension." ) - target_link_libraries(php_dba PRIVATE Cdb::Cdb) + target_link_libraries(php_ext_dba PRIVATE Cdb::Cdb) set(CDB_INCLUDE_FILE "") @@ -360,7 +360,7 @@ if(EXT_DBA_CDB) ) else() target_sources( - php_dba + php_ext_dba PRIVATE libcdb/cdb.c libcdb/cdb_make.c @@ -385,10 +385,10 @@ if(EXT_DBA_DB) TYPE REQUIRED PURPOSE "Necessary to enable the Berkeley DB handler in the dba extension." ) - target_link_libraries(php_dba PRIVATE BerkeleyDB::BerkeleyDB) + target_link_libraries(php_ext_dba PRIVATE BerkeleyDB::BerkeleyDB) # Check whether the Berkeley DB version is supported by PHP. - get_target_property(type php_dba TYPE) + get_target_property(type php_ext_dba TYPE) if( BerkeleyDB_VERSION VERSION_GREATER_EQUAL 4.1 AND BerkeleyDB_VERSION VERSION_LESS 4.1.25 @@ -414,26 +414,26 @@ if(EXT_DBA_DB) set(DB1_INCLUDE_FILE "") set(DBA_DB1 TRUE) set(DB1_VERSION "Berkeley DB 1.85 emulation in DB") - target_sources(php_dba PRIVATE dba_db1.c) + target_sources(php_ext_dba PRIVATE dba_db1.c) endif() if(BerkeleyDB_VERSION VERSION_LESS_EQUAL 1 AND NOT EXT_DBA_DB1) set(DB1_INCLUDE_FILE "") set(DBA_DB1 TRUE) set(DB1_VERSION "Unknown DB1") - target_sources(php_dba PRIVATE dba_db1.c) + target_sources(php_ext_dba PRIVATE dba_db1.c) elseif(BerkeleyDB_VERSION VERSION_LESS_EQUAL 2) set(DB2_INCLUDE_FILE "") set(DBA_DB2 TRUE) - target_sources(php_dba PRIVATE dba_db2.c) + target_sources(php_ext_dba PRIVATE dba_db2.c) elseif(BerkeleyDB_VERSION VERSION_LESS_EQUAL 3) set(DB3_INCLUDE_FILE "") set(DBA_DB3 TRUE) - target_sources(php_dba PRIVATE dba_db3.c) + target_sources(php_ext_dba PRIVATE dba_db3.c) else() set(DB4_INCLUDE_FILE "") set(DBA_DB4 TRUE) - target_sources(php_dba PRIVATE dba_db4.c) + target_sources(php_ext_dba PRIVATE dba_db4.c) endif() endif() @@ -460,9 +460,9 @@ if(EXT_DBA_DBM) ) endif() - target_link_libraries(php_dba PRIVATE Dbm::Dbm) + target_link_libraries(php_ext_dba PRIVATE Dbm::Dbm) - target_sources(php_dba PRIVATE dba_dbm.c) + target_sources(php_ext_dba PRIVATE dba_dbm.c) set(DBM_INCLUDE_FILE "") set(DBA_DBM TRUE) @@ -474,7 +474,7 @@ endif() ################################################################################ if(EXT_DBA_FLATFILE) target_sources( - php_dba + php_ext_dba PRIVATE dba_flatfile.c libflatfile/flatfile.c @@ -503,9 +503,9 @@ if(EXT_DBA_GDBM) PURPOSE "Necessary to enable the GDBM handler in the dba extension." ) - target_link_libraries(php_dba PRIVATE GDBM::GDBM) + target_link_libraries(php_ext_dba PRIVATE GDBM::GDBM) - target_sources(php_dba PRIVATE dba_gdbm.c) + target_sources(php_ext_dba PRIVATE dba_gdbm.c) set(GDBM_INCLUDE_FILE "") set(DBA_GDBM TRUE) @@ -516,7 +516,7 @@ endif() ################################################################################ if(EXT_DBA_INIFILE) target_sources( - php_dba + php_ext_dba PRIVATE dba_inifile.c libinifile/inifile.c @@ -537,9 +537,9 @@ if(EXT_DBA_LMDB) PURPOSE "Necessary to enable the LMDB handler in the dba extension." ) - target_link_libraries(php_dba PRIVATE LMDB::LMDB) + target_link_libraries(php_ext_dba PRIVATE LMDB::LMDB) - target_sources(php_dba PRIVATE dba_lmdb.c) + target_sources(php_ext_dba PRIVATE dba_lmdb.c) set(LMDB_INCLUDE_FILE "") set(DBA_LMDB TRUE) @@ -568,9 +568,9 @@ if(EXT_DBA_NDBM) ) endif() - target_link_libraries(php_dba PRIVATE Ndbm::Ndbm) + target_link_libraries(php_ext_dba PRIVATE Ndbm::Ndbm) - target_sources(php_dba PRIVATE dba_ndbm.c) + target_sources(php_ext_dba PRIVATE dba_ndbm.c) set(NDBM_INCLUDE_FILE "") set(DBA_NDBM TRUE) @@ -588,9 +588,9 @@ if(EXT_DBA_QDBM AND NOT EXT_DBA_DBM AND NOT EXT_DBA_GDBM) PURPOSE "Necessary to enable the QDBM handler in the dba extension." ) - target_link_libraries(php_dba PRIVATE QDBM::QDBM) + target_link_libraries(php_ext_dba PRIVATE QDBM::QDBM) - target_sources(php_dba PRIVATE dba_qdbm.c) + target_sources(php_ext_dba PRIVATE dba_qdbm.c) set(QDBM_INCLUDE_FILE "") set(DBA_QDBM TRUE) @@ -608,9 +608,9 @@ if(EXT_DBA_TCADB) PURPOSE "Necessary to enable the Tokyo Cabinet handler in the dba extension." ) - target_link_libraries(php_dba PRIVATE TokyoCabinet::TokyoCabinet) + target_link_libraries(php_ext_dba PRIVATE TokyoCabinet::TokyoCabinet) - target_sources(php_dba PRIVATE dba_tcadb.c) + target_sources(php_ext_dba PRIVATE dba_tcadb.c) set(TCADB_INCLUDE_FILE "") set(DBA_TCADB TRUE) diff --git a/cmake/ext/dl_test/CMakeLists.txt b/cmake/ext/dl_test/CMakeLists.txt index 1810c8a12..4d1e5430c 100644 --- a/cmake/ext/dl_test/CMakeLists.txt +++ b/cmake/ext/dl_test/CMakeLists.txt @@ -36,16 +36,16 @@ if(NOT EXT_DL_TEST) endif() # The dl_test extension can be built only as a shared library. -add_library(php_dl_test SHARED) +add_library(php_ext_dl_test SHARED) target_sources( - php_dl_test + php_ext_dl_test PRIVATE dl_test.c dl_test.stub.php ) target_compile_definitions( - php_dl_test + php_ext_dl_test PRIVATE ZEND_ENABLE_STATIC_TSRMLS_CACHE # TODO: PHP_DL_TEST_EXPORTS is currently unused. diff --git a/cmake/ext/dom/CMakeLists.txt b/cmake/ext/dom/CMakeLists.txt index 0a910d874..3284bded0 100644 --- a/cmake/ext/dom/CMakeLists.txt +++ b/cmake/ext/dom/CMakeLists.txt @@ -50,13 +50,13 @@ if(NOT EXT_DOM) endif() if(EXT_DOM_SHARED) - add_library(php_dom SHARED) + add_library(php_ext_dom SHARED) else() - add_library(php_dom) + add_library(php_ext_dom) endif() target_sources( - php_dom + php_ext_dom PRIVATE attr.c cdatasection.c @@ -88,7 +88,7 @@ target_sources( ) target_compile_definitions( - php_dom + php_ext_dom PRIVATE $<$,$,MODULE_LIBRARY;SHARED_LIBRARY>>>:LIBXML_STATIC> ) @@ -102,9 +102,9 @@ set_package_properties( PURPOSE "Necessary to enable the dom extension." ) -target_link_libraries(php_dom PRIVATE LibXml2::LibXml2) +target_link_libraries(php_ext_dom PRIVATE LibXml2::LibXml2) -add_dependencies(php_dom php_libxml php_random) +add_dependencies(php_ext_dom php_ext_libxml php_ext_random) set(HAVE_DOM TRUE) diff --git a/cmake/ext/enchant/CMakeLists.txt b/cmake/ext/enchant/CMakeLists.txt index f1556faae..ed95904b6 100644 --- a/cmake/ext/enchant/CMakeLists.txt +++ b/cmake/ext/enchant/CMakeLists.txt @@ -50,13 +50,13 @@ if(NOT EXT_ENCHANT) endif() if(EXT_ENCHANT_SHARED) - add_library(php_enchant SHARED) + add_library(php_ext_enchant SHARED) else() - add_library(php_enchant) + add_library(php_ext_enchant) endif() target_sources( - php_enchant + php_ext_enchant PRIVATE enchant.c enchant.stub.php @@ -88,7 +88,7 @@ if(TARGET Enchant::Enchant) ) endif() -target_link_libraries(php_enchant PRIVATE Enchant::Enchant) +target_link_libraries(php_ext_enchant PRIVATE Enchant::Enchant) set(HAVE_ENCHANT TRUE) diff --git a/cmake/ext/exif/CMakeLists.txt b/cmake/ext/exif/CMakeLists.txt index ffa4413c6..09aac96ef 100644 --- a/cmake/ext/exif/CMakeLists.txt +++ b/cmake/ext/exif/CMakeLists.txt @@ -49,24 +49,24 @@ if(NOT EXT_EXIF) endif() if(EXT_EXIF_SHARED) - add_library(php_exif SHARED) + add_library(php_ext_exif SHARED) else() - add_library(php_exif) + add_library(php_ext_exif) endif() target_sources( - php_exif + php_ext_exif PRIVATE exif.c exif.stub.php ) -target_compile_definitions(php_exif PRIVATE ZEND_ENABLE_STATIC_TSRMLS_CACHE) +target_compile_definitions(php_ext_exif PRIVATE ZEND_ENABLE_STATIC_TSRMLS_CACHE) # Exif extension optionally depends on the mbstring extension when decoding # multibyte data in EXIF tags. if(EXT_MBSTRING) - add_dependencies(php_exif php_mbstring) + add_dependencies(php_ext_exif php_ext_mbstring) endif() set(HAVE_EXIF TRUE) diff --git a/cmake/ext/ffi/CMakeLists.txt b/cmake/ext/ffi/CMakeLists.txt index 2e7d0cdf3..cbab9b8a1 100644 --- a/cmake/ext/ffi/CMakeLists.txt +++ b/cmake/ext/ffi/CMakeLists.txt @@ -53,20 +53,20 @@ if(NOT EXT_FFI) endif() if(EXT_FFI_SHARED) - add_library(php_ffi SHARED) + add_library(php_ext_ffi SHARED) else() - add_library(php_ffi) + add_library(php_ext_ffi) endif() target_sources( - php_ffi + php_ext_ffi PRIVATE ffi_parser.c ffi.c ffi.stub.php ) -target_compile_definitions(php_ffi PRIVATE ZEND_ENABLE_STATIC_TSRMLS_CACHE) +target_compile_definitions(php_ext_ffi PRIVATE ZEND_ENABLE_STATIC_TSRMLS_CACHE) find_package(FFI 3.0.11) set_package_properties( @@ -76,7 +76,7 @@ set_package_properties( PURPOSE "Necessary to enable the ffi extension." ) -target_link_libraries(php_ffi PRIVATE FFI::FFI) +target_link_libraries(php_ext_ffi PRIVATE FFI::FFI) check_type_size("long double" LONG_DOUBLE) diff --git a/cmake/ext/fileinfo/CMakeLists.txt b/cmake/ext/fileinfo/CMakeLists.txt index 2d11298f6..10b15f74f 100644 --- a/cmake/ext/fileinfo/CMakeLists.txt +++ b/cmake/ext/fileinfo/CMakeLists.txt @@ -21,7 +21,7 @@ Build extension as shared. #]=============================================================================] project( - PHPExtensionFileinfo + PhpExtensionFileinfo LANGUAGES C ) @@ -52,13 +52,13 @@ if(NOT EXT_FILEINFO) endif() if(EXT_FILEINFO_SHARED) - add_library(php_fileinfo SHARED) + add_library(php_ext_fileinfo SHARED) else() - add_library(php_fileinfo) + add_library(php_ext_fileinfo) endif() target_sources( - php_fileinfo + php_ext_fileinfo PRIVATE fileinfo.c fileinfo.stub.php @@ -93,7 +93,7 @@ cmake_push_check_state(RESET) cmake_pop_check_state() if(NOT HAVE_STRCASESTR) message(STATUS "Using libmagic strcasestr implementation") - target_sources(php_fileinfo PRIVATE libmagic/strcasestr.c) + target_sources(php_ext_fileinfo PRIVATE libmagic/strcasestr.c) endif() check_symbol_exists(strndup "string.h" HAVE_STRNDUP) @@ -102,7 +102,7 @@ check_symbol_exists(utimes "sys/time.h" HAVE_UTIMES) php_check_function_attribute(visibility HAVE_VISIBILITY) target_compile_definitions( - php_fileinfo + php_ext_fileinfo PRIVATE # The wchar.h and inttypes.h headers are always available by C99 standard. # The libmagic still includes them conditionally. @@ -118,6 +118,6 @@ set_property( OBJECT_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/data_file.c ) -add_dependencies(php_fileinfo php_pcre) +add_dependencies(php_ext_fileinfo php_ext_pcre) configure_file(cmake/config.h.in config.h) diff --git a/cmake/ext/filter/CMakeLists.txt b/cmake/ext/filter/CMakeLists.txt index 45c6f5b37..6a99c8594 100644 --- a/cmake/ext/filter/CMakeLists.txt +++ b/cmake/ext/filter/CMakeLists.txt @@ -49,13 +49,13 @@ if(NOT EXT_FILTER) endif() if(EXT_FILTER_SHARED) - add_library(php_filter SHARED) + add_library(php_ext_filter SHARED) else() - add_library(php_filter) + add_library(php_ext_filter) endif() target_sources( - php_filter + php_ext_filter PRIVATE callback_filter.c filter.c @@ -68,6 +68,6 @@ target_sources( php_filter.h ) -target_compile_definitions(php_filter PRIVATE ZEND_ENABLE_STATIC_TSRMLS_CACHE) +target_compile_definitions(php_ext_filter PRIVATE ZEND_ENABLE_STATIC_TSRMLS_CACHE) -add_dependencies(php_filter php_pcre) +add_dependencies(php_ext_filter php_ext_pcre) diff --git a/cmake/ext/ftp/CMakeLists.txt b/cmake/ext/ftp/CMakeLists.txt index 7509b13e8..8fdc233f0 100644 --- a/cmake/ext/ftp/CMakeLists.txt +++ b/cmake/ext/ftp/CMakeLists.txt @@ -68,13 +68,13 @@ if(NOT EXT_FTP) endif() if(EXT_FTP_SHARED) - add_library(php_ftp SHARED) + add_library(php_ext_ftp SHARED) else() - add_library(php_ftp) + add_library(php_ext_ftp) endif() target_sources( - php_ftp + php_ext_ftp PRIVATE ftp.c ftp.stub.php @@ -90,7 +90,7 @@ if(EXT_FTP_SSL OR EXT_OPENSSL) PURPOSE "Necessary to enable the ftp extension." ) - target_link_libraries(php_ftp PRIVATE OpenSSL::SSL) + target_link_libraries(php_ext_ftp PRIVATE OpenSSL::SSL) set(HAVE_FTP_SSL TRUE) endif() diff --git a/cmake/ext/gd/CMakeLists.txt b/cmake/ext/gd/CMakeLists.txt index 5c22e0d34..d340ce5c4 100644 --- a/cmake/ext/gd/CMakeLists.txt +++ b/cmake/ext/gd/CMakeLists.txt @@ -203,13 +203,13 @@ if(NOT EXT_GD) endif() if(EXT_GD_SHARED) - add_library(php_gd SHARED) + add_library(php_ext_gd SHARED) else() - add_library(php_gd) + add_library(php_ext_gd) endif() target_sources( - php_gd + php_ext_gd PRIVATE gd.c gd.stub.php @@ -223,7 +223,7 @@ target_sources( if(NOT EXT_GD_EXTERNAL) target_sources( - php_gd + php_ext_gd PRIVATE libgd/gd_avif.c libgd/gd_bmp.c @@ -293,7 +293,7 @@ if(NOT EXT_GD_EXTERNAL) set(HAVE_GD_TGA TRUE) target_compile_definitions( - php_gd + php_ext_gd PRIVATE # Bundled GD library uses the C99 standard fabsf and floorf conditionally. HAVE_FABSF=1 @@ -304,16 +304,16 @@ if(NOT EXT_GD_EXTERNAL) fabsf HEADERS math.h LIBRARIES m - TARGET php_gd PRIVATE + TARGET php_ext_gd PRIVATE ) - target_include_directories(php_gd PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/libgd) + target_include_directories(php_ext_gd PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/libgd) # Add -Wno-strict-prototypes C flag: https://github.com/php/php-src/pull/10803 php_check_compiler_flag(C -Wno-strict-prototypes HAVE_WNO_STRICT_PROTOTYPES_C) if(HAVE_WNO_STRICT_PROTOTYPES_C) target_compile_options( - php_gd + php_ext_gd PRIVATE $<$:-Wno-strict-prototypes> ) @@ -327,7 +327,7 @@ if(NOT EXT_GD_EXTERNAL) PURPOSE "Necessary to enable the gd extension." ) - target_link_libraries(php_gd PRIVATE ZLIB::ZLIB) + target_link_libraries(php_ext_gd PRIVATE ZLIB::ZLIB) find_package(PNG) set_package_properties( @@ -337,7 +337,7 @@ if(NOT EXT_GD_EXTERNAL) PURPOSE "Necessary to enable the gd extension." ) - target_link_libraries(php_gd PRIVATE PNG::PNG) + target_link_libraries(php_ext_gd PRIVATE PNG::PNG) set(HAVE_LIBPNG TRUE) @@ -350,7 +350,7 @@ if(NOT EXT_GD_EXTERNAL) PURPOSE "Necessary to enable the AVIF support in the gd extension." ) - target_link_libraries(php_gd PRIVATE libavif::libavif) + target_link_libraries(php_ext_gd PRIVATE libavif::libavif) set(HAVE_LIBAVIF TRUE) set(HAVE_GD_AVIF TRUE) @@ -365,7 +365,7 @@ if(NOT EXT_GD_EXTERNAL) PURPOSE "Necessary to enable the WebP support in the gd extension." ) - target_link_libraries(php_gd PRIVATE WebP::WebP) + target_link_libraries(php_ext_gd PRIVATE WebP::WebP) set(HAVE_LIBWEBP TRUE) set(HAVE_GD_WEBP TRUE) @@ -380,7 +380,7 @@ if(NOT EXT_GD_EXTERNAL) PURPOSE "Necessary to enable the JPEG support in the gd extension." ) - target_link_libraries(php_gd PRIVATE JPEG::JPEG) + target_link_libraries(php_ext_gd PRIVATE JPEG::JPEG) set(HAVE_LIBJPEG TRUE) set(HAVE_GD_JPG TRUE) @@ -395,7 +395,7 @@ if(NOT EXT_GD_EXTERNAL) PURPOSE "Necessary to enable the XPM support in the gd extension." ) - target_link_libraries(php_gd PRIVATE XPM::XPM) + target_link_libraries(php_ext_gd PRIVATE XPM::XPM) set(HAVE_XPM TRUE) set(HAVE_GD_XPM TRUE) @@ -410,7 +410,7 @@ if(NOT EXT_GD_EXTERNAL) PURPOSE "Necessary to enable the Freetype support in the gd extension." ) - target_link_libraries(php_gd PRIVATE Freetype::Freetype) + target_link_libraries(php_ext_gd PRIVATE Freetype::Freetype) set(HAVE_LIBFREETYPE TRUE) set(HAVE_GD_FREETYPE TRUE) @@ -423,7 +423,7 @@ if(NOT EXT_GD_EXTERNAL) # Do sanity check when all required packages are found. block() - get_target_property(libraries php_gd LINK_LIBRARIES) + get_target_property(libraries php_ext_gd LINK_LIBRARIES) set(doSanityCheck TRUE) foreach(library ${libraries}) if(library MATCHES "^.+::.+$" AND NOT TARGET ${library}) @@ -460,9 +460,9 @@ else() PURPOSE "Necessary to enable the gd extension with external GD library." ) - target_link_libraries(php_gd PRIVATE GD::GD) + target_link_libraries(php_ext_gd PRIVATE GD::GD) - target_sources(php_gd PRIVATE gd_compat.c) + target_sources(php_ext_gd PRIVATE gd_compat.c) if(TARGET GD::GD) # Sanity check. @@ -485,7 +485,7 @@ else() # does not support the Foo format. Those junk functions display a warning # but eventually return normally, making a simple link or run test # insufficient. - function(php_gd_check_format format result) + function(php_ext_gd_check_format format result) cmake_push_check_state(RESET) set(CMAKE_REQUIRED_LIBRARIES GD::GD) @@ -527,13 +527,13 @@ else() cmake_pop_check_state() endfunction() - php_gd_check_format(Png HAVE_GD_PNG) - php_gd_check_format(Avif HAVE_GD_AVIF) - php_gd_check_format(Webp HAVE_GD_WEBP) - php_gd_check_format(Jpeg HAVE_GD_JPG) - php_gd_check_format(Xpm HAVE_GD_XPM) - php_gd_check_format(Bmp HAVE_GD_BMP) - php_gd_check_format(Tga HAVE_GD_TGA) + php_ext_gd_check_format(Png HAVE_GD_PNG) + php_ext_gd_check_format(Avif HAVE_GD_AVIF) + php_ext_gd_check_format(Webp HAVE_GD_WEBP) + php_ext_gd_check_format(Jpeg HAVE_GD_JPG) + php_ext_gd_check_format(Xpm HAVE_GD_XPM) + php_ext_gd_check_format(Bmp HAVE_GD_BMP) + php_ext_gd_check_format(Tga HAVE_GD_TGA) check_library_exists(GD::GD gdFontCacheShutdown "" HAVE_GD_FREETYPE) check_library_exists(GD::GD gdVersionString "" HAVE_GD_LIBVERSION) diff --git a/cmake/ext/gettext/CMakeLists.txt b/cmake/ext/gettext/CMakeLists.txt index c12625065..179388239 100644 --- a/cmake/ext/gettext/CMakeLists.txt +++ b/cmake/ext/gettext/CMakeLists.txt @@ -51,13 +51,13 @@ if(NOT EXT_GETTEXT) endif() if(EXT_GETTEXT_SHARED) - add_library(php_gettext SHARED) + add_library(php_ext_gettext SHARED) else() - add_library(php_gettext) + add_library(php_ext_gettext) endif() target_sources( - php_gettext + php_ext_gettext PRIVATE gettext.c gettext.stub.php @@ -71,7 +71,7 @@ set_package_properties( PURPOSE "Necessary to enable the gettext extension." ) -target_link_libraries(php_gettext PRIVATE Intl::Intl) +target_link_libraries(php_ext_gettext PRIVATE Intl::Intl) if(TARGET Intl::Intl) # Sanity check. diff --git a/cmake/ext/gmp/CMakeLists.txt b/cmake/ext/gmp/CMakeLists.txt index 71cf196b0..b9aa30776 100644 --- a/cmake/ext/gmp/CMakeLists.txt +++ b/cmake/ext/gmp/CMakeLists.txt @@ -49,13 +49,13 @@ if(NOT EXT_GMP) endif() if(EXT_GMP_SHARED) - add_library(php_gmp SHARED) + add_library(php_ext_gmp SHARED) else() - add_library(php_gmp) + add_library(php_ext_gmp) endif() target_sources( - php_gmp + php_ext_gmp PRIVATE gmp.c gmp.stub.php @@ -65,7 +65,7 @@ target_sources( php_gmp_int.h ) -target_compile_definitions(php_gmp PRIVATE ZEND_ENABLE_STATIC_TSRMLS_CACHE) +target_compile_definitions(php_ext_gmp PRIVATE ZEND_ENABLE_STATIC_TSRMLS_CACHE) find_package(GMP 4.2) set_package_properties( @@ -75,9 +75,9 @@ set_package_properties( PURPOSE "Necessary to enable the gmp extension." ) -target_link_libraries(php_gmp PUBLIC GMP::GMP) +target_link_libraries(php_ext_gmp PUBLIC GMP::GMP) -add_dependencies(php_gmp php_random) +add_dependencies(php_ext_gmp php_ext_random) set(HAVE_GMP TRUE) diff --git a/cmake/ext/hash/CMakeLists.txt b/cmake/ext/hash/CMakeLists.txt index 62e159e3c..601955ffd 100644 --- a/cmake/ext/hash/CMakeLists.txt +++ b/cmake/ext/hash/CMakeLists.txt @@ -55,10 +55,10 @@ else() message(CHECK_FAIL "no") endif() -add_library(php_hash OBJECT) +add_library(php_ext_hash OBJECT) target_sources( - php_hash + php_ext_hash PRIVATE hash_adler32.c hash_crc32.c @@ -101,7 +101,7 @@ target_sources( xxhash/xxhash.h ) -target_include_directories(php_hash PRIVATE xxhash) +target_include_directories(php_ext_hash PRIVATE xxhash) if(WORDS_BIGENDIAN) set(HAVE_SLOW_HASH3 TRUE) @@ -110,7 +110,7 @@ else() block() if(CMAKE_SIZEOF_VOID_P EQUAL 4) set(sha3Dir "sha3/generic32lc") - target_sources(php_hash PRIVATE ${sha3Dir}/KeccakP-1600-inplace32BI.c) + target_sources(php_ext_hash PRIVATE ${sha3Dir}/KeccakP-1600-inplace32BI.c) # Add -Wno-implicit-fallthrough flag due to warnings on 32-bit builds. php_check_compiler_flag( @@ -128,25 +128,25 @@ else() endif() else() set(sha3Dir "sha3/generic64lc") - target_sources(php_hash PRIVATE ${sha3Dir}/KeccakP-1600-opt64.c) + target_sources(php_ext_hash PRIVATE ${sha3Dir}/KeccakP-1600-opt64.c) endif() target_sources( - php_hash + php_ext_hash PRIVATE ${sha3Dir}/KeccakHash.c ${sha3Dir}/KeccakSponge.c ) target_include_directories( - php_hash + php_ext_hash PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/${sha3Dir} ) endblock() target_compile_definitions( - php_hash + php_ext_hash PRIVATE KeccakP200_excluded KeccakP400_excluded diff --git a/cmake/ext/iconv/CMakeLists.txt b/cmake/ext/iconv/CMakeLists.txt index 78fa22fe9..31ee75422 100644 --- a/cmake/ext/iconv/CMakeLists.txt +++ b/cmake/ext/iconv/CMakeLists.txt @@ -54,13 +54,13 @@ if(NOT EXT_ICONV) endif() if(EXT_ICONV_SHARED) - add_library(php_iconv SHARED) + add_library(php_ext_iconv SHARED) else() - add_library(php_iconv) + add_library(php_ext_iconv) endif() target_sources( - php_iconv + php_ext_iconv PRIVATE iconv.c iconv.stub.php @@ -72,7 +72,7 @@ target_sources( ) target_compile_definitions( - php_iconv + php_ext_iconv PRIVATE ZEND_ENABLE_STATIC_TSRMLS_CACHE $<$:PHP_ICONV_EXPORTS> @@ -86,7 +86,7 @@ set_package_properties( PURPOSE "Necessary to enable the iconv extension." ) -target_link_libraries(php_iconv PRIVATE Iconv::Iconv) +target_link_libraries(php_ext_iconv PRIVATE Iconv::Iconv) if(TARGET Iconv::Iconv) # Sanity and library type checks. diff --git a/cmake/ext/imap/CMakeLists.txt b/cmake/ext/imap/CMakeLists.txt index 9f14a0fdd..6a8810d66 100644 --- a/cmake/ext/imap/CMakeLists.txt +++ b/cmake/ext/imap/CMakeLists.txt @@ -80,19 +80,19 @@ if(NOT EXT_IMAP) endif() if(EXT_IMAP_SHARED) - add_library(php_imap SHARED) + add_library(php_ext_imap SHARED) else() - add_library(php_imap) + add_library(php_ext_imap) endif() target_sources( - php_imap + php_ext_imap PRIVATE php_imap.c php_imap.stub.php ) -target_compile_definitions(php_imap PRIVATE ZEND_ENABLE_STATIC_TSRMLS_CACHE) +target_compile_definitions(php_ext_imap PRIVATE ZEND_ENABLE_STATIC_TSRMLS_CACHE) find_package(Cclient) set_package_properties( @@ -103,7 +103,7 @@ set_package_properties( ) target_link_libraries( - php_imap + php_ext_imap PRIVATE $<$:ws2_32;secur32;crypt32;winmm> # Link publicly for internal_functions files. @@ -132,7 +132,7 @@ if(TARGET Cclient::Cclient) PURPOSE "Necessary for Kerberos support in the imap extension." ) - target_link_libraries(php_imap PRIVATE Kerberos::Krb5 Kerberos::GSSAPI) + target_link_libraries(php_ext_imap PRIVATE Kerberos::Krb5 Kerberos::GSSAPI) if(Kerberos_FOUND) set(HAVE_IMAP_KRB TRUE) @@ -173,7 +173,7 @@ if(TARGET Cclient::Cclient) PURPOSE "Necessary to enable SSL in the imap extension." ) - target_link_libraries(php_imap PRIVATE OpenSSL::SSL) + target_link_libraries(php_ext_imap PRIVATE OpenSSL::SSL) if(OpenSSL_FOUND) set(HAVE_IMAP_SSL TRUE) diff --git a/cmake/ext/intl/CMakeLists.txt b/cmake/ext/intl/CMakeLists.txt index aecb2c703..3e49bc818 100644 --- a/cmake/ext/intl/CMakeLists.txt +++ b/cmake/ext/intl/CMakeLists.txt @@ -53,13 +53,13 @@ endif() enable_language(CXX) if(EXT_INTL_SHARED) - add_library(php_intl SHARED) + add_library(php_ext_intl SHARED) else() - add_library(php_intl) + add_library(php_ext_intl) endif() target_sources( - php_intl + php_ext_intl PRIVATE breakiterator/breakiterator_class.cpp breakiterator/breakiterator_iterators.cpp @@ -154,7 +154,7 @@ target_sources( php_check_compiler_flag(C -Wno-write-strings HAVE_WNO_WRITE_STRINGS_C) if(HAVE_WNO_WRITE_STRINGS_C) target_compile_options( - php_intl + php_ext_intl PRIVATE $<$:-Wno-write-strings> ) @@ -163,14 +163,14 @@ endif() php_check_compiler_flag(CXX -Wno-write-strings HAVE_WNO_WRITE_STRINGS_CXX) if(HAVE_WNO_WRITE_STRINGS_CXX) target_compile_options( - php_intl + php_ext_intl PRIVATE $<$:-Wno-write-strings> ) endif() target_compile_definitions( - php_intl + php_ext_intl PRIVATE U_NO_DEFAULT_INCLUDE_UTF_HEADERS=1 __STDC_LIMIT_MACROS @@ -182,7 +182,7 @@ target_compile_definitions( if(CMAKE_SYSTEM_NAME STREQUAL "CYGWIN") target_compile_definitions( - php_intl + php_ext_intl PRIVATE $<$:_POSIX_C_SOURCE=200809L> ) @@ -198,24 +198,24 @@ set_package_properties( if(ICU_VERSION VERSION_GREATER_EQUAL 74) set_target_properties( - php_intl + php_ext_intl PROPERTIES CXX_STANDARD 17 CXX_STANDARD_REQUIRED TRUE ) else() set_target_properties( - php_intl + php_ext_intl PROPERTIES CXX_STANDARD 11 CXX_STANDARD_REQUIRED TRUE ) endif() -target_link_libraries(php_intl PRIVATE ICU::io ICU::uc ICU::i18n) +target_link_libraries(php_ext_intl PRIVATE ICU::io ICU::uc ICU::i18n) if(ICU_VERSION VERSION_GREATER_EQUAL 60) - target_compile_definitions(php_intl PRIVATE U_HIDE_OBSOLETE_UTF_OLD_H=1) + target_compile_definitions(php_ext_intl PRIVATE U_HIDE_OBSOLETE_UTF_OLD_H=1) endif() -add_dependencies(php_intl php_date) +add_dependencies(php_ext_intl php_ext_date) diff --git a/cmake/ext/json/CMakeLists.txt b/cmake/ext/json/CMakeLists.txt index 0c500a38c..6cb2ac281 100644 --- a/cmake/ext/json/CMakeLists.txt +++ b/cmake/ext/json/CMakeLists.txt @@ -20,10 +20,10 @@ add_feature_info( "JavaScript Object Notation" ) -add_library(php_json OBJECT) +add_library(php_ext_json OBJECT) target_sources( - php_json + php_ext_json PRIVATE json_encoder.c json_parser.tab.c @@ -38,11 +38,11 @@ target_sources( php_json.h ) -target_compile_definitions(php_json PRIVATE ZEND_ENABLE_STATIC_TSRMLS_CACHE) +target_compile_definitions(php_ext_json PRIVATE ZEND_ENABLE_STATIC_TSRMLS_CACHE) if(BISON_FOUND) bison_target( - php_json_parser + php_ext_json_parser json_parser.y ${CMAKE_CURRENT_SOURCE_DIR}/json_parser.tab.c COMPILE_FLAGS "${PHP_DEFAULT_BISON_FLAGS}" @@ -50,13 +50,13 @@ if(BISON_FOUND) DEFINES_FILE ${CMAKE_CURRENT_SOURCE_DIR}/json_parser.tab.h ) - add_custom_target(php_json_parser DEPENDS ${BISON_TARGET_outputs}) - add_dependencies(php_generate_files php_json_parser) + add_custom_target(php_ext_json_parser DEPENDS ${BISON_TARGET_outputs}) + add_dependencies(php_generate_files php_ext_json_parser) endif() if(RE2C_FOUND) re2c_target( - php_json_scanner + php_ext_json_scanner json_scanner.re ${CMAKE_CURRENT_SOURCE_DIR}/json_scanner.c HEADER ${CMAKE_CURRENT_SOURCE_DIR}/php_json_scanner_defs.h diff --git a/cmake/ext/ldap/CMakeLists.txt b/cmake/ext/ldap/CMakeLists.txt index 3763cd659..457522512 100644 --- a/cmake/ext/ldap/CMakeLists.txt +++ b/cmake/ext/ldap/CMakeLists.txt @@ -68,19 +68,19 @@ if(NOT EXT_LDAP) endif() if(EXT_LDAP_SHARED) - add_library(php_ldap SHARED) + add_library(php_ext_ldap SHARED) else() - add_library(php_ldap) + add_library(php_ext_ldap) endif() target_sources( - php_ldap + php_ext_ldap PRIVATE ldap.c ldap.stub.php ) -target_compile_definitions(php_ldap PRIVATE ZEND_ENABLE_STATIC_TSRMLS_CACHE) +target_compile_definitions(php_ext_ldap PRIVATE ZEND_ENABLE_STATIC_TSRMLS_CACHE) find_package(LDAP) set_package_properties( @@ -90,7 +90,7 @@ set_package_properties( PURPOSE "Necessary to enable the ldap extension." ) -target_link_libraries(php_ldap PRIVATE LDAP::LDAP) +target_link_libraries(php_ext_ldap PRIVATE LDAP::LDAP) if(TARGET LDAP::LDAP) cmake_push_check_state(RESET) @@ -150,7 +150,7 @@ if(EXT_LDAP_SASL) PURPOSE "Necessary to enable the Cyrus SASL support in the ldap extension." ) - target_link_libraries(php_ldap PRIVATE SASL::SASL) + target_link_libraries(php_ext_ldap PRIVATE SASL::SASL) set(HAVE_LDAP_SASL TRUE) endif() diff --git a/cmake/ext/libxml/CMakeLists.txt b/cmake/ext/libxml/CMakeLists.txt index 29e80625d..ece7698d7 100644 --- a/cmake/ext/libxml/CMakeLists.txt +++ b/cmake/ext/libxml/CMakeLists.txt @@ -38,10 +38,10 @@ if(NOT EXT_LIBXML) return() endif() -add_library(php_libxml STATIC) +add_library(php_ext_libxml STATIC) target_sources( - php_libxml + php_ext_libxml PRIVATE libxml.c libxml.stub.php @@ -53,7 +53,7 @@ target_sources( ) target_compile_definitions( - php_libxml + php_ext_libxml PRIVATE ZEND_ENABLE_STATIC_TSRMLS_CACHE $<$:LIBXML_STATIC;LIBXML_STATIC_FOR_DLL> @@ -71,13 +71,13 @@ set_package_properties( # HAVE_WIN32_THREADS is not needed on newer libxml2 versions anymore. if(LIBXML2_VERSION_STRING VERSION_LESS 2.10) target_compile_definitions( - php_libxml + php_ext_libxml PRIVATE $<$:HAVE_WIN32_THREADS> ) endif() -target_link_libraries(php_libxml PUBLIC LibXml2::LibXml2) +target_link_libraries(php_ext_libxml PUBLIC LibXml2::LibXml2) set(HAVE_LIBXML TRUE) diff --git a/cmake/ext/mbstring/CMakeLists.txt b/cmake/ext/mbstring/CMakeLists.txt index 804a15638..e452d36b7 100644 --- a/cmake/ext/mbstring/CMakeLists.txt +++ b/cmake/ext/mbstring/CMakeLists.txt @@ -76,13 +76,13 @@ endif() ################################################################################ if(EXT_MBSTRING_SHARED) - add_library(php_mbstring SHARED) + add_library(php_ext_mbstring SHARED) else() - add_library(php_mbstring) + add_library(php_ext_mbstring) endif() target_sources( - php_mbstring + php_ext_mbstring PRIVATE mb_gpc.c mbstring.c @@ -94,13 +94,13 @@ target_sources( mbstring.h ) -target_compile_definitions(php_mbstring PRIVATE ZEND_ENABLE_STATIC_TSRMLS_CACHE) +target_compile_definitions(php_ext_mbstring PRIVATE ZEND_ENABLE_STATIC_TSRMLS_CACHE) # The mbstring extension doesn't seem to support interprocedural optimization # (IPO). -set_target_properties(php_mbstring PROPERTIES INTERPROCEDURAL_OPTIMIZATION OFF) +set_target_properties(php_ext_mbstring PROPERTIES INTERPROCEDURAL_OPTIMIZATION OFF) -add_dependencies(php_mbstring php_pcre) +add_dependencies(php_ext_mbstring php_ext_pcre) set(HAVE_MBSTRING TRUE) @@ -108,7 +108,7 @@ set(HAVE_MBSTRING TRUE) # Configure libmbfl. ################################################################################ -set(LIBMBFL_TARGET php_mbstring) +set(LIBMBFL_TARGET php_ext_mbstring) add_subdirectory(libmbfl) file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/libmbfl/config.h "\n" [[ @@ -136,7 +136,7 @@ if(EXT_MBSTRING_MBREGEX) PURPOSE "Necessary for multibyte regex in the mbstring extension." ) - target_link_libraries(php_mbstring PRIVATE Oniguruma::Oniguruma) + target_link_libraries(php_ext_mbstring PRIVATE Oniguruma::Oniguruma) if(TARGET Oniguruma::Oniguruma) message(CHECK_START "Checking for invalid KOI8 encoding entry in Oniguruma") @@ -163,7 +163,7 @@ if(EXT_MBSTRING_MBREGEX) endif() target_compile_definitions( - php_mbstring + php_ext_mbstring PRIVATE $<$>:ONIG_ESCAPE_UCHAR_COLLISION> $<$>:UChar=OnigUChar> @@ -173,7 +173,7 @@ if(EXT_MBSTRING_MBREGEX) ) target_sources( - php_mbstring + php_ext_mbstring PRIVATE php_mbregex.c PUBLIC diff --git a/cmake/ext/mbstring/libmbfl/CMakeLists.txt b/cmake/ext/mbstring/libmbfl/CMakeLists.txt index cc1706e1a..76b807b74 100644 --- a/cmake/ext/mbstring/libmbfl/CMakeLists.txt +++ b/cmake/ext/mbstring/libmbfl/CMakeLists.txt @@ -10,7 +10,7 @@ approach is used, with no alternative implementations provided at this stage. Adding libmbfl with `add_subdirectory()`: ```cmake -set(LIBMBFL_TARGET php_mbstring) +set(LIBMBFL_TARGET php_ext_mbstring) add_subdirectory(libmbfl) ``` #]=============================================================================] diff --git a/cmake/ext/mysqli/CMakeLists.txt b/cmake/ext/mysqli/CMakeLists.txt index 605541a83..5b5324e97 100644 --- a/cmake/ext/mysqli/CMakeLists.txt +++ b/cmake/ext/mysqli/CMakeLists.txt @@ -91,13 +91,13 @@ if(NOT EXT_MYSQLI) endif() if(EXT_MYSQLI_SHARED) - add_library(php_mysqli SHARED) + add_library(php_ext_mysqli SHARED) else() - add_library(php_mysqli) + add_library(php_ext_mysqli) endif() target_sources( - php_mysqli + php_ext_mysqli PRIVATE mysqli_api.c mysqli_driver.c @@ -116,9 +116,9 @@ target_sources( php_mysqli_structs.h ) -add_dependencies(php_mysqli php_mysqlnd php_spl) +add_dependencies(php_ext_mysqli php_ext_mysqlnd php_ext_spl) -target_compile_definitions(php_mysqli PRIVATE ZEND_ENABLE_STATIC_TSRMLS_CACHE) +target_compile_definitions(php_ext_mysqli PRIVATE ZEND_ENABLE_STATIC_TSRMLS_CACHE) if(EXT_MYSQL_SOCKET) if(EXT_MYSQL_SOCKET_PATH) diff --git a/cmake/ext/mysqlnd/CMakeLists.txt b/cmake/ext/mysqlnd/CMakeLists.txt index 99eb451f5..54f6a77cd 100644 --- a/cmake/ext/mysqlnd/CMakeLists.txt +++ b/cmake/ext/mysqlnd/CMakeLists.txt @@ -97,13 +97,13 @@ if(NOT EXT_MYSQLND) endif() if(EXT_MYSQLND_SHARED) - add_library(php_mysqlnd SHARED) + add_library(php_ext_mysqlnd SHARED) else() - add_library(php_mysqlnd) + add_library(php_ext_mysqlnd) endif() target_sources( - php_mysqlnd + php_ext_mysqlnd PRIVATE mysqlnd_alloc.c mysqlnd_auth.c @@ -159,10 +159,10 @@ target_sources( php_mysqlnd.h ) -target_compile_definitions(php_mysqlnd PRIVATE ZEND_ENABLE_STATIC_TSRMLS_CACHE) +target_compile_definitions(php_ext_mysqlnd PRIVATE ZEND_ENABLE_STATIC_TSRMLS_CACHE) target_link_libraries( - php_mysqlnd + php_ext_mysqlnd PRIVATE $<$:ws2_32> ) @@ -176,7 +176,7 @@ if(EXT_MYSQLND_COMPRESSION) PURPOSE "Necessary to enable compression in the mysqlnd extension." ) - target_link_libraries(php_mysqlnd PRIVATE ZLIB::ZLIB) + target_link_libraries(php_ext_mysqlnd PRIVATE ZLIB::ZLIB) set(MYSQLND_COMPRESSION_ENABLED TRUE) endif() @@ -191,7 +191,7 @@ if( OR CMAKE_SYSTEM_NAME STREQUAL "Windows" ) if(CMAKE_SYSTEM_NAME STREQUAL "Windows") - target_link_libraries(php_mysqlnd PRIVATE crypt32) + target_link_libraries(php_ext_mysqlnd PRIVATE crypt32) else() find_package(OpenSSL ${PHP_OPENSSL_MIN_VERSION}) set_package_properties( @@ -200,12 +200,12 @@ if( TYPE REQUIRED PURPOSE "Necessary to enable SSL in the mysqlnd extension." ) - target_link_libraries(php_mysqlnd PRIVATE OpenSSL::Crypto) + target_link_libraries(php_ext_mysqlnd PRIVATE OpenSSL::Crypto) endif() set(MYSQLND_HAVE_SSL TRUE) - add_dependencies(php_mysqlnd php_hash) + add_dependencies(php_ext_mysqlnd php_ext_hash) endif() add_feature_info( diff --git a/cmake/ext/oci8/CMakeLists.txt b/cmake/ext/oci8/CMakeLists.txt index a610abb7e..a0c1c4fa2 100644 --- a/cmake/ext/oci8/CMakeLists.txt +++ b/cmake/ext/oci8/CMakeLists.txt @@ -92,13 +92,13 @@ if(NOT EXT_OCI8) endif() if(EXT_OCI8_SHARED) - add_library(php_oci8 SHARED) + add_library(php_ext_oci8 SHARED) else() - add_library(php_oci8) + add_library(php_ext_oci8) endif() target_sources( - php_oci8 + php_ext_oci8 PRIVATE oci8_collection.c oci8_failover.c @@ -119,9 +119,9 @@ if(NOT PHP_OCI8_INSTANT_CLIENT AND NOT CMAKE_SYSTEM_NAME STREQUAL "Windows") else() set(dir ${CMAKE_CURRENT_SOURCE_DIR}) endif() - cmake_language(DEFER DIRECTORY ${dir} CALL php_oci8_notice) + cmake_language(DEFER DIRECTORY ${dir} CALL php_ext_oci8_notice) endif() -function(php_oci8_notice) +function(php_ext_oci8_notice) cmake_language(DEFER CALL message NOTICE [[ The oci8 extension notice: diff --git a/cmake/ext/odbc/CMakeLists.txt b/cmake/ext/odbc/CMakeLists.txt index 924c0f376..6b7b8a552 100644 --- a/cmake/ext/odbc/CMakeLists.txt +++ b/cmake/ext/odbc/CMakeLists.txt @@ -277,20 +277,20 @@ if(NOT EXT_ODBC) endif() if(EXT_ODBC_SHARED) - add_library(php_odbc SHARED) + add_library(php_ext_odbc SHARED) else() - add_library(php_odbc) + add_library(php_ext_odbc) endif() target_sources( - php_odbc + php_ext_odbc PRIVATE odbc_utils.c odbc.stub.php php_odbc.c ) -target_compile_definitions(php_odbc PRIVATE ZEND_ENABLE_STATIC_TSRMLS_CACHE) +target_compile_definitions(php_ext_odbc PRIVATE ZEND_ENABLE_STATIC_TSRMLS_CACHE) if(NOT EXT_ODBC_TYPE STREQUAL "auto") set(ODBC_USE_DRIVER "${EXT_ODBC_TYPE}") @@ -303,7 +303,7 @@ set_package_properties( PURPOSE "Necessary to enable the odbc extension." ) -target_link_libraries(php_odbc PRIVATE ODBC::ODBC) +target_link_libraries(php_ext_odbc PRIVATE ODBC::ODBC) # Sanity checks. if(EXT_ODBC_TYPE STREQUAL "ibm-db2" AND TARGET ODBC::ODBC) diff --git a/cmake/ext/opcache/CMakeLists.txt b/cmake/ext/opcache/CMakeLists.txt index 1d34d29bf..f75574e70 100644 --- a/cmake/ext/opcache/CMakeLists.txt +++ b/cmake/ext/opcache/CMakeLists.txt @@ -82,10 +82,10 @@ endif() # Add library. ################################################################################ -add_library(php_opcache SHARED) +add_library(php_ext_opcache SHARED) target_sources( - php_opcache + php_ext_opcache PRIVATE opcache.stub.php $<$>:shared_alloc_mmap.c> @@ -104,19 +104,19 @@ target_sources( ZendAccelerator.c ) -add_dependencies(php_opcache php_date php_pcre) +add_dependencies(php_ext_opcache php_ext_date php_ext_pcre) if(CMAKE_SYSTEM_NAME STREQUAL "Windows") - add_dependencies(php_opcache php_hash) + add_dependencies(php_ext_opcache php_ext_hash) endif() set_target_properties( - php_opcache + php_ext_opcache PROPERTIES PHP_ZEND_EXTENSION TRUE ) -target_compile_definitions(php_opcache PRIVATE ZEND_ENABLE_STATIC_TSRMLS_CACHE) +target_compile_definitions(php_ext_opcache PRIVATE ZEND_ENABLE_STATIC_TSRMLS_CACHE) if(EXT_OPCACHE_HUGE_CODE_PAGES) set(HAVE_HUGE_CODE_PAGES TRUE) @@ -187,9 +187,9 @@ if(EXT_OPCACHE_JIT) endif() # Generate zend_jit_.c file. - add_executable(php_opcache_jit_minilua jit/dynasm/minilua.c) + add_executable(php_ext_opcache_jit_minilua jit/dynasm/minilua.c) set_target_properties( - php_opcache_jit_minilua + php_ext_opcache_jit_minilua PROPERTIES RUNTIME_OUTPUT_DIRECTORY CMakeFiles ) @@ -199,7 +199,7 @@ if(EXT_OPCACHE_JIT) floor HEADERS math.h LIBRARIES m - TARGET php_opcache_jit_minilua PRIVATE + TARGET php_ext_opcache_jit_minilua PRIVATE ) # Help minilua create a jit build directory. @@ -216,7 +216,7 @@ if(EXT_OPCACHE_JIT) add_custom_command( OUTPUT jit/zend_jit_${DASM_ARCH}.c COMMAND - php_opcache_jit_minilua ${CMAKE_CURRENT_SOURCE_DIR}/jit/dynasm/dynasm.lua + php_ext_opcache_jit_minilua ${CMAKE_CURRENT_SOURCE_DIR}/jit/dynasm/dynasm.lua ${DASM_FLAGS} -o ${CMAKE_CURRENT_BINARY_DIR}/jit/zend_jit_${DASM_ARCH}.c ${CMAKE_CURRENT_SOURCE_DIR}/jit/zend_jit_${DASM_ARCH}.dasc @@ -229,7 +229,7 @@ if(EXT_OPCACHE_JIT) ) target_sources( - php_opcache + php_ext_opcache PRIVATE $<$>:jit/zend_jit_gdb.c> jit/zend_jit_vm_helpers.c @@ -245,7 +245,7 @@ if(EXT_OPCACHE_JIT) # The string.h header is always available with C89 standard. The bundled # ext/opcache/jit/libudis86 still includes it conditionally. - target_compile_definitions(php_opcache PRIVATE HAVE_STRING_H=1) + target_compile_definitions(php_ext_opcache PRIVATE HAVE_STRING_H=1) php_check_compiler_flag( C @@ -253,7 +253,7 @@ if(EXT_OPCACHE_JIT) _HAVE_WNO_IMPLICIT_FALLTHROUGH_C ) if(_HAVE_WNO_IMPLICIT_FALLTHROUGH_C) - target_compile_options(php_opcache PRIVATE -Wno-implicit-fallthrough) + target_compile_options(php_ext_opcache PRIVATE -Wno-implicit-fallthrough) endif() # Check for Capstone. @@ -266,7 +266,7 @@ if(EXT_OPCACHE_JIT) PURPOSE "Necessary to enable OPcache JIT disassembly through Capstone." ) - target_link_libraries(php_opcache PRIVATE Capstone::Capstone) + target_link_libraries(php_ext_opcache PRIVATE Capstone::Capstone) set(HAVE_CAPSTONE TRUE) endif() @@ -295,7 +295,7 @@ check_symbol_exists(mprotect "sys/mman.h" HAVE_MPROTECT) # Check for shared memory support. include(cmake/CheckSHM.cmake) if(TARGET PHP::CheckSHMLibrary) - target_link_libraries(php_opcache PRIVATE PHP::CheckSHMLibrary) + target_link_libraries(php_ext_opcache PRIVATE PHP::CheckSHMLibrary) endif() configure_file(cmake/config.h.in config.h) diff --git a/cmake/ext/openssl/CMakeLists.txt b/cmake/ext/openssl/CMakeLists.txt index 48dce192c..4650adbe1 100644 --- a/cmake/ext/openssl/CMakeLists.txt +++ b/cmake/ext/openssl/CMakeLists.txt @@ -110,13 +110,13 @@ if(NOT EXT_OPENSSL) endif() if(EXT_OPENSSL_SHARED) - add_library(php_openssl SHARED) + add_library(php_ext_openssl SHARED) else() - add_library(php_openssl) + add_library(php_ext_openssl) endif() target_sources( - php_openssl + php_ext_openssl PRIVATE openssl.c openssl.stub.php @@ -138,7 +138,7 @@ if(EXT_OPENSSL_KERBEROS) PURPOSE "Necessary to use Kerberos support in the openssl extension." ) - target_link_libraries(php_openssl PRIVATE Kerberos::Krb5 Kerberos::GSSAPI) + target_link_libraries(php_ext_openssl PRIVATE Kerberos::Krb5 Kerberos::GSSAPI) endif() find_package(OpenSSL ${PHP_OPENSSL_MIN_VERSION}) @@ -150,10 +150,10 @@ set_package_properties( ) # Link publicly for internal_functions files. -target_link_libraries(php_openssl PUBLIC OpenSSL::SSL OpenSSL::Crypto) +target_link_libraries(php_ext_openssl PUBLIC OpenSSL::SSL OpenSSL::Crypto) block(PROPAGATE HAVE_OPENSSL_EXT_CODE) - get_target_property(type php_openssl TYPE) + get_target_property(type php_ext_openssl TYPE) if( CMAKE_SYSTEM_NAME STREQUAL "Windows" AND type MATCHES "^(MODULE|SHARED)_LIBRARY$" diff --git a/cmake/ext/pcntl/CMakeLists.txt b/cmake/ext/pcntl/CMakeLists.txt index 513404835..d8026632f 100644 --- a/cmake/ext/pcntl/CMakeLists.txt +++ b/cmake/ext/pcntl/CMakeLists.txt @@ -62,22 +62,22 @@ if(NOT EXT_PCNTL) endif() if(EXT_PCNTL_SHARED) - add_library(php_pcntl SHARED) + add_library(php_ext_pcntl SHARED) else() - add_library(php_pcntl) + add_library(php_ext_pcntl) endif() -set_target_properties(php_pcntl PROPERTIES PHP_CLI TRUE) +set_target_properties(php_ext_pcntl PROPERTIES PHP_CLI TRUE) target_sources( - php_pcntl + php_ext_pcntl PRIVATE pcntl.c pcntl.stub.php php_signal.c ) -target_compile_definitions(php_pcntl PRIVATE ZEND_ENABLE_STATIC_TSRMLS_CACHE) +target_compile_definitions(php_ext_pcntl PRIVATE ZEND_ENABLE_STATIC_TSRMLS_CACHE) # Check for required functions. block() @@ -115,7 +115,7 @@ cmake_push_check_state(RESET) cmake_pop_check_state() if(HAVE_STRUCT_SIGINFO_T) - target_compile_definitions(php_pcntl PRIVATE HAVE_STRUCT_SIGINFO_T) + target_compile_definitions(php_ext_pcntl PRIVATE HAVE_STRUCT_SIGINFO_T) endif() configure_file(cmake/config.h.in config.h) diff --git a/cmake/ext/pcre/CMakeLists.txt b/cmake/ext/pcre/CMakeLists.txt index f3ff3a354..55d59b399 100644 --- a/cmake/ext/pcre/CMakeLists.txt +++ b/cmake/ext/pcre/CMakeLists.txt @@ -63,10 +63,10 @@ option( mark_as_advanced(EXT_PCRE_EXTERNAL EXT_PCRE_JIT) -add_library(php_pcre OBJECT) +add_library(php_ext_pcre OBJECT) target_sources( - php_pcre + php_ext_pcre PRIVATE php_pcre.c php_pcre.def @@ -80,7 +80,7 @@ target_sources( # TODO: Fix this better for OBJECT libraries, which can't handle .def files. set_source_files_properties(php_pcre.def PROPERTIES HEADER_FILE_ONLY TRUE) -target_compile_definitions(php_pcre PRIVATE ZEND_ENABLE_STATIC_TSRMLS_CACHE) +target_compile_definitions(php_ext_pcre PRIVATE ZEND_ENABLE_STATIC_TSRMLS_CACHE) set(PCRE2_CODE_UNIT_WIDTH 8) @@ -93,7 +93,7 @@ if(EXT_PCRE_EXTERNAL) PURPOSE "Necessary to use external PCRE library in the pcre extension." ) - target_link_libraries(php_pcre PRIVATE PCRE::PCRE) + target_link_libraries(php_ext_pcre PRIVATE PCRE::PCRE) if(TARGET PCRE::PCRE AND EXT_PCRE_JIT) message(CHECK_START "Checking for PCRE JIT support") @@ -142,7 +142,7 @@ else() block() target_sources( - php_pcre + php_ext_pcre PRIVATE pcre2lib/pcre2_auto_possess.c pcre2lib/pcre2_chartables.c @@ -209,7 +209,7 @@ else() endif() target_compile_definitions( - php_pcre + php_ext_pcre PRIVATE # PCRE2 library uses C99 memmove() function conditionally in some files. HAVE_MEMMOVE @@ -234,7 +234,7 @@ else() message(CHECK_PASS "yes") php_check_compiler_flag(C -mshstk _HAVE_MSHSTK_C) if(_HAVE_MSHSTK_C) - target_compile_options(php_pcre PRIVATE -mshstk) + target_compile_options(php_ext_pcre PRIVATE -mshstk) endif() else() message(CHECK_FAIL "no") @@ -246,7 +246,7 @@ else() # Enable pcre Valgrind support only in Debug build (it affects performance). if(PHP_VALGRIND) target_compile_definitions( - php_pcre + php_ext_pcre PRIVATE $<$:HAVE_PCRE_VALGRIND_SUPPORT> ) diff --git a/cmake/ext/pdo/CMakeLists.txt b/cmake/ext/pdo/CMakeLists.txt index 9befcb5ea..3627a9ff5 100644 --- a/cmake/ext/pdo/CMakeLists.txt +++ b/cmake/ext/pdo/CMakeLists.txt @@ -49,13 +49,13 @@ if(NOT EXT_PDO) endif() if(EXT_PDO_SHARED) - add_library(php_pdo SHARED) + add_library(php_ext_pdo SHARED) else() - add_library(php_pdo) + add_library(php_ext_pdo) endif() target_sources( - php_pdo + php_ext_pdo PRIVATE pdo_dbh.c pdo_dbh.stub.php @@ -73,11 +73,11 @@ target_sources( php_pdo_error.h ) -add_dependencies(php_pdo php_spl) +add_dependencies(php_ext_pdo php_ext_spl) if(RE2C_FOUND) re2c_target( - php_pdo_sql_parser + php_ext_pdo_sql_parser pdo_sql_parser.re ${CMAKE_CURRENT_SOURCE_DIR}/pdo_sql_parser.c ) diff --git a/cmake/ext/pdo_dblib/CMakeLists.txt b/cmake/ext/pdo_dblib/CMakeLists.txt index 5e0c5a38c..55615e770 100644 --- a/cmake/ext/pdo_dblib/CMakeLists.txt +++ b/cmake/ext/pdo_dblib/CMakeLists.txt @@ -50,30 +50,30 @@ if(NOT EXT_PDO_DBLIB) endif() if(EXT_PDO_DBLIB_SHARED) - add_library(php_pdo_dblib SHARED) + add_library(php_ext_pdo_dblib SHARED) else() - add_library(php_pdo_dblib) + add_library(php_ext_pdo_dblib) endif() target_sources( - php_pdo_dblib + php_ext_pdo_dblib PRIVATE dblib_driver.c dblib_stmt.c pdo_dblib.c ) -add_dependencies(php_pdo_dblib php_pdo) +add_dependencies(php_ext_pdo_dblib php_ext_pdo) target_compile_definitions( - php_pdo_dblib + php_ext_pdo_dblib PRIVATE ZEND_ENABLE_STATIC_TSRMLS_CACHE PDO_DBLIB_FLAVOUR="freetds" ) target_include_directories( - php_pdo_dblib + php_ext_pdo_dblib PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/.. ) @@ -86,7 +86,7 @@ set_package_properties( PURPOSE "Necessary to enable the pdo_dblib extension." ) -target_link_libraries(php_pdo_dblib PRIVATE FreeTDS::FreeTDS) +target_link_libraries(php_ext_pdo_dblib PRIVATE FreeTDS::FreeTDS) set(HAVE_PDO_DBLIB TRUE) diff --git a/cmake/ext/pdo_firebird/CMakeLists.txt b/cmake/ext/pdo_firebird/CMakeLists.txt index 0f5e3cbf9..689e8dc6e 100644 --- a/cmake/ext/pdo_firebird/CMakeLists.txt +++ b/cmake/ext/pdo_firebird/CMakeLists.txt @@ -50,23 +50,23 @@ if(NOT EXT_PDO_FIREBIRD) endif() if(EXT_PDO_FIREBIRD_SHARED) - add_library(php_pdo_firebird SHARED) + add_library(php_ext_pdo_firebird SHARED) else() - add_library(php_pdo_firebird) + add_library(php_ext_pdo_firebird) endif() target_sources( - php_pdo_firebird + php_ext_pdo_firebird PRIVATE firebird_driver.c firebird_statement.c pdo_firebird.c ) -add_dependencies(php_pdo_firebird php_pdo) +add_dependencies(php_ext_pdo_firebird php_ext_pdo) target_include_directories( - php_pdo_firebird + php_ext_pdo_firebird PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/.. ) @@ -79,7 +79,7 @@ set_package_properties( PURPOSE "Necessary to enable the pdo_firebird extension." ) -target_link_libraries(php_pdo_firebird PRIVATE Firebird::Firebird) +target_link_libraries(php_ext_pdo_firebird PRIVATE Firebird::Firebird) # Sanity check. if(TARGET Firebird::Firebird) @@ -87,9 +87,9 @@ if(TARGET Firebird::Firebird) Firebird::Firebird isc_detach_database "" - _php_pdo_firebird_sanity_check + _php_ext_pdo_firebird_sanity_check ) - if(NOT _php_pdo_firebird_sanity_check) + if(NOT _php_ext_pdo_firebird_sanity_check) message( FATAL_ERROR "Firebird sanity check failed: isc_detach_database() not found." diff --git a/cmake/ext/pdo_mysql/CMakeLists.txt b/cmake/ext/pdo_mysql/CMakeLists.txt index 4c1f7d921..9d9399692 100644 --- a/cmake/ext/pdo_mysql/CMakeLists.txt +++ b/cmake/ext/pdo_mysql/CMakeLists.txt @@ -76,29 +76,29 @@ if(NOT EXT_PDO_MYSQL) endif() if(EXT_PDO_MYSQL_SHARED) - add_library(php_pdo_mysql SHARED) + add_library(php_ext_pdo_mysql SHARED) else() - add_library(php_pdo_mysql) + add_library(php_ext_pdo_mysql) endif() target_sources( - php_pdo_mysql + php_ext_pdo_mysql PRIVATE mysql_driver.c mysql_statement.c pdo_mysql.c ) -add_dependencies(php_pdo_mysql php_pdo) +add_dependencies(php_ext_pdo_mysql php_ext_pdo) target_compile_definitions( - php_pdo_mysql + php_ext_pdo_mysql PRIVATE ZEND_ENABLE_STATIC_TSRMLS_CACHE ) target_include_directories( - php_pdo_mysql + php_ext_pdo_mysql PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/.. ) @@ -122,7 +122,7 @@ if(MySQL_Socket_PATH) endif() if(NOT EXT_PDO_MYSQL_DRIVER STREQUAL "mysql") - add_dependencies(php_pdo_mysql php_mysqlnd) + add_dependencies(php_ext_pdo_mysql php_ext_mysqlnd) set(PDO_USE_MYSQLND TRUE) @@ -134,7 +134,7 @@ else() PURPOSE "Necessary to enable the pdo_mysql extension." ) - target_link_libraries(php_pdo_mysql PRIVATE MySQL::MySQL) + target_link_libraries(php_ext_pdo_mysql PRIVATE MySQL::MySQL) if(MySQL_Socket_PATH) set(PDO_MYSQL_UNIX_ADDR "${MySQL_Socket_PATH}") diff --git a/cmake/ext/pdo_oci/CMakeLists.txt b/cmake/ext/pdo_oci/CMakeLists.txt index f5d60a4f7..0024514f8 100644 --- a/cmake/ext/pdo_oci/CMakeLists.txt +++ b/cmake/ext/pdo_oci/CMakeLists.txt @@ -49,23 +49,23 @@ if(NOT EXT_PDO_OCI) endif() if(EXT_PDO_OCI_SHARED) - add_library(php_pdo_oci SHARED) + add_library(php_ext_pdo_oci SHARED) else() - add_library(php_pdo_oci) + add_library(php_ext_pdo_oci) endif() target_sources( - php_pdo_oci + php_ext_pdo_oci PRIVATE oci_driver.c oci_statement.c pdo_oci.c ) -add_dependencies(php_pdo_oci php_pdo) +add_dependencies(php_ext_pdo_oci php_ext_pdo) target_include_directories( - php_pdo_oci + php_ext_pdo_oci PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/.. ) diff --git a/cmake/ext/pdo_odbc/CMakeLists.txt b/cmake/ext/pdo_odbc/CMakeLists.txt index 6e8427057..55f16a347 100644 --- a/cmake/ext/pdo_odbc/CMakeLists.txt +++ b/cmake/ext/pdo_odbc/CMakeLists.txt @@ -134,13 +134,13 @@ if(NOT EXT_PDO_ODBC) endif() if(EXT_PDO_ODBC_SHARED) - add_library(php_pdo_odbc SHARED) + add_library(php_ext_pdo_odbc SHARED) else() - add_library(php_pdo_odbc) + add_library(php_ext_pdo_odbc) endif() target_sources( - php_pdo_odbc + php_ext_pdo_odbc PRIVATE odbc_driver.c odbc_stmt.c @@ -148,10 +148,10 @@ target_sources( pdo_odbc.stub.php ) -add_dependencies(php_pdo_odbc php_pdo) +add_dependencies(php_ext_pdo_odbc php_ext_pdo) target_include_directories( - php_pdo_odbc + php_ext_pdo_odbc PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/.. ) @@ -247,6 +247,6 @@ if(TARGET ODBC::ODBC) endif() endif() -target_link_libraries(php_pdo_odbc PRIVATE ODBC::ODBC) +target_link_libraries(php_ext_pdo_odbc PRIVATE ODBC::ODBC) configure_file(cmake/config.h.in config.h) diff --git a/cmake/ext/pdo_pgsql/CMakeLists.txt b/cmake/ext/pdo_pgsql/CMakeLists.txt index a0abe93ef..85b73df8c 100644 --- a/cmake/ext/pdo_pgsql/CMakeLists.txt +++ b/cmake/ext/pdo_pgsql/CMakeLists.txt @@ -50,13 +50,13 @@ if(NOT EXT_PDO_PGSQL) endif() if(EXT_PDO_PGSQL_SHARED) - add_library(php_pdo_pgsql SHARED) + add_library(php_ext_pdo_pgsql SHARED) else() - add_library(php_pdo_pgsql) + add_library(php_ext_pdo_pgsql) endif() target_sources( - php_pdo_pgsql + php_ext_pdo_pgsql PRIVATE pdo_pgsql.c pgsql_driver.c @@ -64,10 +64,10 @@ target_sources( pgsql_statement.c ) -add_dependencies(php_pdo_pgsql php_pdo) +add_dependencies(php_ext_pdo_pgsql php_ext_pdo) target_include_directories( - php_pdo_pgsql + php_ext_pdo_pgsql PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/.. ) @@ -80,7 +80,7 @@ set_package_properties( PURPOSE "Necessary to enable the pdo_pgsql extension." ) -target_link_libraries(php_pdo_pgsql PUBLIC PostgreSQL::PostgreSQL) +target_link_libraries(php_ext_pdo_pgsql PUBLIC PostgreSQL::PostgreSQL) # Sanity check. if(TARGET PostgreSQL::PostgreSQL) diff --git a/cmake/ext/pdo_sqlite/CMakeLists.txt b/cmake/ext/pdo_sqlite/CMakeLists.txt index 57522e394..69b0deea4 100644 --- a/cmake/ext/pdo_sqlite/CMakeLists.txt +++ b/cmake/ext/pdo_sqlite/CMakeLists.txt @@ -50,13 +50,13 @@ if(NOT EXT_PDO_SQLITE) endif() if(EXT_PDO_SQLITE_SHARED) - add_library(php_pdo_sqlite SHARED) + add_library(php_ext_pdo_sqlite SHARED) else() - add_library(php_pdo_sqlite) + add_library(php_ext_pdo_sqlite) endif() target_sources( - php_pdo_sqlite + php_ext_pdo_sqlite PRIVATE pdo_sqlite.c sqlite_driver.c @@ -64,10 +64,10 @@ target_sources( sqlite_statement.c ) -add_dependencies(php_pdo_sqlite php_pdo) +add_dependencies(php_ext_pdo_sqlite php_ext_pdo) target_include_directories( - php_pdo_sqlite + php_ext_pdo_sqlite PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/.. ) @@ -80,7 +80,7 @@ set_package_properties( PURPOSE "Necessary to enable the pdo_sqlite extension." ) -target_link_libraries(php_pdo_sqlite PRIVATE SQLite::SQLite3) +target_link_libraries(php_ext_pdo_sqlite PRIVATE SQLite::SQLite3) if(TARGET SQLite::SQLite3) set(HAVE_PDO_SQLITELIB TRUE) diff --git a/cmake/ext/pgsql/CMakeLists.txt b/cmake/ext/pgsql/CMakeLists.txt index 8c77068c5..32f297f81 100644 --- a/cmake/ext/pgsql/CMakeLists.txt +++ b/cmake/ext/pgsql/CMakeLists.txt @@ -21,7 +21,7 @@ Build extension as shared. #]=============================================================================] project( - PhpExtensionPgSql + php_ext_pgsql LANGUAGES C ) @@ -50,26 +50,26 @@ if(NOT EXT_PGSQL) endif() if(EXT_PGSQL_SHARED) - add_library(php_pgsql SHARED) + add_library(php_ext_pgsql SHARED) else() - add_library(php_pgsql) + add_library(php_ext_pgsql) endif() target_sources( - php_pgsql + php_ext_pgsql PRIVATE pgsql.c pgsql.stub.php ) target_compile_definitions( - php_pgsql + php_ext_pgsql PRIVATE ZEND_ENABLE_STATIC_TSRMLS_CACHE $<$:PGSQL_EXPORTS> ) -add_dependencies(php_pgsql php_pcre) +add_dependencies(php_ext_pgsql php_ext_pcre) find_package(PostgreSQL ${PHP_POSTGRESQL_MIN_VERSION}) set_package_properties( @@ -79,7 +79,7 @@ set_package_properties( PURPOSE "Necessary to enable the pgsql extension." ) -target_link_libraries(php_pgsql PUBLIC PostgreSQL::PostgreSQL) +target_link_libraries(php_ext_pgsql PUBLIC PostgreSQL::PostgreSQL) if(TARGET PostgreSQL::PostgreSQL) # PostgreSQL library minimum version sanity check. diff --git a/cmake/ext/phar/CMakeLists.txt b/cmake/ext/phar/CMakeLists.txt index 2d47a5f13..3105a32d4 100644 --- a/cmake/ext/phar/CMakeLists.txt +++ b/cmake/ext/phar/CMakeLists.txt @@ -53,13 +53,13 @@ endif() ################################################################################ if(EXT_PHAR_SHARED) - add_library(php_phar SHARED) + add_library(php_ext_phar SHARED) else() - add_library(php_phar) + add_library(php_ext_phar) endif() target_sources( - php_phar + php_ext_phar PRIVATE dirstream.c func_interceptors.c @@ -77,20 +77,20 @@ target_sources( php_phar.h ) -target_compile_definitions(php_phar PRIVATE ZEND_ENABLE_STATIC_TSRMLS_CACHE) +target_compile_definitions(php_ext_phar PRIVATE ZEND_ENABLE_STATIC_TSRMLS_CACHE) target_link_options( - php_phar + php_ext_phar PRIVATE # Silence irrelevant-to-us warning in release builds. $<$>,$>:LINKER:/IGNORE:4089> ) -add_dependencies(php_phar php_hash php_spl) +add_dependencies(php_ext_phar php_ext_hash php_ext_spl) if(RE2C_FOUND) re2c_target( - php_phar_path_check + php_ext_phar_path_check phar_path_check.re ${CMAKE_CURRENT_SOURCE_DIR}/phar_path_check.c OPTIONS -b @@ -212,7 +212,7 @@ file( ) add_custom_command( - OUTPUT php_phar_generated_phar + OUTPUT php_ext_phar_generated_phar COMMAND ${CMAKE_COMMAND} -P CMakeFiles/PharPermissions.cmake DEPENDS @@ -228,15 +228,15 @@ file( ) add_custom_target( - php_phar_generate_file + php_ext_phar_generate_file ALL DEPENDS PHP::SAPI::cli - php_phar + php_ext_phar ${dependentFiles} - php_phar_generated_phar + php_ext_phar_generated_phar ) -set_property(SOURCE php_phar_generated_phar PROPERTY SYMBOLIC TRUE) +set_property(SOURCE php_ext_phar_generated_phar PROPERTY SYMBOLIC TRUE) # Install phar.phar file to destination. Here a duplicate phar.phar generation # step is used to generate it to a destination directory because of the install diff --git a/cmake/ext/posix/CMakeLists.txt b/cmake/ext/posix/CMakeLists.txt index 3dea0b7ba..df459bdeb 100644 --- a/cmake/ext/posix/CMakeLists.txt +++ b/cmake/ext/posix/CMakeLists.txt @@ -59,19 +59,19 @@ if(NOT EXT_POSIX) endif() if(EXT_POSIX_SHARED) - add_library(php_posix SHARED) + add_library(php_ext_posix SHARED) else() - add_library(php_posix) + add_library(php_ext_posix) endif() target_sources( - php_posix + php_ext_posix PRIVATE posix.c posix.stub.php ) -target_compile_definitions(php_posix PRIVATE ZEND_ENABLE_STATIC_TSRMLS_CACHE) +target_compile_definitions(php_ext_posix PRIVATE ZEND_ENABLE_STATIC_TSRMLS_CACHE) check_symbol_exists(ctermid "stdio.h" HAVE_CTERMID) cmake_push_check_state(RESET) diff --git a/cmake/ext/pspell/CMakeLists.txt b/cmake/ext/pspell/CMakeLists.txt index 3e4a9be69..d457f60d1 100644 --- a/cmake/ext/pspell/CMakeLists.txt +++ b/cmake/ext/pspell/CMakeLists.txt @@ -50,13 +50,13 @@ if(NOT EXT_PSPELL) endif() if(EXT_PSPELL_SHARED) - add_library(php_pspell SHARED) + add_library(php_ext_pspell SHARED) else() - add_library(php_pspell) + add_library(php_ext_pspell) endif() target_sources( - php_pspell + php_ext_pspell PRIVATE pspell.c pspell.stub.php @@ -66,7 +66,7 @@ target_sources( php_check_compiler_flag(C -Wno-strict-prototypes HAVE_WNO_STRICT_PROTOTYPES_C) if(HAVE_WNO_STRICT_PROTOTYPES_C) target_compile_options( - php_pspell + php_ext_pspell PRIVATE $<$:-Wno-strict-prototypes> ) @@ -80,7 +80,7 @@ set_package_properties( PURPOSE "Necessary to enable the pspell extension." ) -target_link_libraries(php_pspell PRIVATE Aspell::Aspell) +target_link_libraries(php_ext_pspell PRIVATE Aspell::Aspell) set(HAVE_PSPELL TRUE) diff --git a/cmake/ext/random/CMakeLists.txt b/cmake/ext/random/CMakeLists.txt index c640eb2b1..93d21101e 100644 --- a/cmake/ext/random/CMakeLists.txt +++ b/cmake/ext/random/CMakeLists.txt @@ -22,10 +22,10 @@ add_feature_info( "randomness-related generators and functions" ) -add_library(php_random OBJECT) +add_library(php_ext_random OBJECT) target_sources( - php_random + php_ext_random PRIVATE csprng.c engine_combinedlcg.c @@ -44,7 +44,7 @@ target_sources( php_random.h ) -target_compile_definitions(php_random PRIVATE ZEND_ENABLE_STATIC_TSRMLS_CACHE) +target_compile_definitions(php_ext_random PRIVATE ZEND_ENABLE_STATIC_TSRMLS_CACHE) check_symbol_exists(arc4random_buf "stdlib.h" HAVE_DECL_ARC4RANDOM_BUF) check_symbol_exists(getrandom "sys/random.h" HAVE_GETRANDOM) diff --git a/cmake/ext/readline/CMakeLists.txt b/cmake/ext/readline/CMakeLists.txt index bedae3d1f..215792847 100644 --- a/cmake/ext/readline/CMakeLists.txt +++ b/cmake/ext/readline/CMakeLists.txt @@ -72,15 +72,15 @@ if(NOT EXT_READLINE) endif() if(EXT_READLINE_SHARED) - add_library(php_readline SHARED) + add_library(php_ext_readline SHARED) else() - add_library(php_readline) + add_library(php_ext_readline) endif() -set_target_properties(php_readline PROPERTIES PHP_CLI TRUE) +set_target_properties(php_ext_readline PROPERTIES PHP_CLI TRUE) target_sources( - php_readline + php_ext_readline PRIVATE readline_cli.c readline.c @@ -91,7 +91,7 @@ target_sources( php_check_compiler_flag(C -Wno-strict-prototypes HAVE_WNO_STRICT_PROTOTYPES_C) if(HAVE_WNO_STRICT_PROTOTYPES_C) target_compile_options( - php_readline + php_ext_readline PRIVATE $<$:-Wno-strict-prototypes> ) @@ -106,7 +106,7 @@ if(NOT EXT_READLINE_LIBREADLINE) PURPOSE "Necessary to enable the readline extension." ) - target_link_libraries(php_readline PUBLIC Editline::Editline) + target_link_libraries(php_ext_readline PUBLIC Editline::Editline) if(TARGET Editline::Editline) check_library_exists( @@ -153,7 +153,7 @@ else() PURPOSE "Necessary to enable the readline extension." ) - target_link_libraries(php_readline PUBLIC Readline::Readline) + target_link_libraries(php_ext_readline PUBLIC Readline::Readline) if(TARGET Readline::Readline) # Sanity minimum version check if Readline library has the @@ -236,14 +236,14 @@ if(CURSES_FOUND AND NOT TARGET Curses::Curses) ) endif() -target_link_libraries(php_readline PRIVATE Curses::Curses) +target_link_libraries(php_ext_readline PRIVATE Curses::Curses) # TODO: Check for the obsolescent termcap library more properly. if(NOT CURSES_FOUND) check_library_exists(termcap, tgetent "" _have_termcap_library) if(_have_termcap_library) - target_link_libraries(php_readline PRIVATE termcap) + target_link_libraries(php_ext_readline PRIVATE termcap) endif() endif() ]]# diff --git a/cmake/ext/reflection/CMakeLists.txt b/cmake/ext/reflection/CMakeLists.txt index 66f615854..234043c27 100644 --- a/cmake/ext/reflection/CMakeLists.txt +++ b/cmake/ext/reflection/CMakeLists.txt @@ -8,7 +8,7 @@ always enabled. #]=============================================================================] project( - PhpExtensionReflection + php_ext_reflection LANGUAGES C ) @@ -20,18 +20,18 @@ add_feature_info( "PHP code introspection API" ) -add_library(php_reflection OBJECT) +add_library(php_ext_reflection OBJECT) target_sources( - php_reflection + php_ext_reflection PRIVATE php_reflection.c php_reflection.stub.php ) target_compile_definitions( - php_reflection + php_ext_reflection PRIVATE ZEND_ENABLE_STATIC_TSRMLS_CACHE ) -add_dependencies(php_reflection php_random) +add_dependencies(php_ext_reflection php_ext_random) diff --git a/cmake/ext/session/CMakeLists.txt b/cmake/ext/session/CMakeLists.txt index d1aba7ade..23dc72f51 100644 --- a/cmake/ext/session/CMakeLists.txt +++ b/cmake/ext/session/CMakeLists.txt @@ -71,13 +71,13 @@ if(NOT EXT_SESSION) endif() if(EXT_SESSION_SHARED) - add_library(php_session SHARED) + add_library(php_ext_session SHARED) else() - add_library(php_session) + add_library(php_ext_session) endif() target_sources( - php_session + php_ext_session PRIVATE mod_files.c mod_user_class.c @@ -93,16 +93,16 @@ target_sources( ) target_compile_definitions( - php_session + php_ext_session PRIVATE ZEND_ENABLE_STATIC_TSRMLS_CACHE ) add_dependencies( - php_session - php_date - php_random - php_spl # Optional dependency for spl autoloading https://bugs.php.net/53141 + php_ext_session + php_ext_date + php_ext_random + php_ext_spl # Optional dependency for spl autoloading https://bugs.php.net/53141 ) # Check whether pread() and pwrite() work. @@ -120,7 +120,7 @@ if(EXT_SESSION_MM) endif() target_sources( - php_session + php_ext_session PRIVATE mod_mm.c PUBLIC @@ -138,7 +138,7 @@ if(EXT_SESSION_MM) ) # Link with PUBLIC scope if include directories are on non-standard places. - target_link_libraries(php_session PUBLIC MM::MM) + target_link_libraries(php_ext_session PUBLIC MM::MM) if(TARGET MM::MM) set(HAVE_LIBMM TRUE) diff --git a/cmake/ext/shmop/CMakeLists.txt b/cmake/ext/shmop/CMakeLists.txt index 0ed5a2e08..c9fed917a 100644 --- a/cmake/ext/shmop/CMakeLists.txt +++ b/cmake/ext/shmop/CMakeLists.txt @@ -49,13 +49,13 @@ if(NOT EXT_SHMOP) endif() if(EXT_SHMOP_SHARED) - add_library(php_shmop SHARED) + add_library(php_ext_shmop SHARED) else() - add_library(php_shmop) + add_library(php_ext_shmop) endif() target_sources( - php_shmop + php_ext_shmop PRIVATE shmop.c shmop.stub.php diff --git a/cmake/ext/simplexml/CMakeLists.txt b/cmake/ext/simplexml/CMakeLists.txt index 1b9272a6e..047bb05d2 100644 --- a/cmake/ext/simplexml/CMakeLists.txt +++ b/cmake/ext/simplexml/CMakeLists.txt @@ -49,13 +49,13 @@ if(NOT EXT_SIMPLEXML) endif() if(EXT_SIMPLEXML_SHARED) - add_library(php_simplexml SHARED) + add_library(php_ext_simplexml SHARED) else() - add_library(php_simplexml) + add_library(php_ext_simplexml) endif() target_sources( - php_simplexml + php_ext_simplexml PRIVATE simplexml.c simplexml.stub.php @@ -67,14 +67,14 @@ target_sources( ) target_compile_definitions( - php_simplexml + php_ext_simplexml PRIVATE # TODO: Fix LIBXML_STATIC usage based on the static/shared libxml2 package. $<$,$,MODULE_LIBRARY;SHARED_LIBRARY>>>:LIBXML_STATIC> $<$:PHP_SIMPLEXML_EXPORTS> ) -add_dependencies(php_simplexml php_libxml php_spl) +add_dependencies(php_ext_simplexml php_ext_libxml php_ext_spl) include(Packages/LibXml2) @@ -85,7 +85,7 @@ set_package_properties( PURPOSE "Necessary to enable the simplexml extension." ) -target_link_libraries(php_simplexml PRIVATE LibXml2::LibXml2) +target_link_libraries(php_ext_simplexml PRIVATE LibXml2::LibXml2) set(HAVE_SIMPLEXML TRUE) diff --git a/cmake/ext/skeleton/CMakeLists.txt.in b/cmake/ext/skeleton/CMakeLists.txt.in index 3b24eae23..92a1c0fbc 100644 --- a/cmake/ext/skeleton/CMakeLists.txt.in +++ b/cmake/ext/skeleton/CMakeLists.txt.in @@ -30,7 +30,7 @@ endif() # Set the extension project metadata. project( - PhpExtension%EXTNAME% + %EXTNAME% VERSION 0.1.0 DESCRIPTION "Describe the extension" HOMEPAGE_URL "https://example.org" @@ -71,23 +71,23 @@ endif() # Add a target to be built as a SHARED or STATIC library. if(EXT_%EXTNAMECAPS%_SHARED) - add_library(php_%EXTNAME% SHARED) + add_library(php_ext_%EXTNAME% SHARED) else() - add_library(php_%EXTNAME%) + add_library(php_ext_%EXTNAME%) endif() # Configure extension as CLI-based. Such extensions are only meant to be used # and enabled on CLI-based PHP SAPIs, such as cgi, cli, phpdbg, embed, etc. -#set_target_properties(php_%EXTNAME% PROPERTIES PHP_CLI TRUE) +#set_target_properties(php_ext_%EXTNAME% PROPERTIES PHP_CLI TRUE) # Configure extension as Zend extension. Zend extensions are loaded with the # 'zend_extension' INI directive and include additional advanced hooks. Use only # when building advanced extensions, such as debuggers, profilers, caching, etc. -#set_target_properties(php_%EXTNAME% PROPERTIES PHP_ZEND_EXTENSION TRUE) +#set_target_properties(php_ext_%EXTNAME% PROPERTIES PHP_ZEND_EXTENSION TRUE) # Add library target sources. target_sources( - php_%EXTNAME% + php_ext_%EXTNAME% PRIVATE %EXTNAME%.c %EXTNAME%.stub.php @@ -101,7 +101,7 @@ target_sources( # Add compile definitions. target_compile_definitions( - php_%EXTNAME% + php_ext_%EXTNAME% PRIVATE # Enable "Thread Safety Resource Manager Local Storage" static cache. ZEND_ENABLE_STATIC_TSRMLS_CACHE @@ -112,11 +112,11 @@ find_package(PHP REQUIRED) # The PHP::PHP library contains INTERFACE include directories for the extension. # Link PHP and extension targets. -target_link_libraries(php_%EXTNAME% PRIVATE PHP::PHP) +target_link_libraries(php_ext_%EXTNAME% PRIVATE PHP::PHP) # Install files to system destinations when running 'cmake --install'. install( - TARGETS php_%EXTNAME% + TARGETS php_ext_%EXTNAME% ARCHIVE EXCLUDE_FROM_ALL FILE_SET HEADERS DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PHP_INCLUDE_PREFIX}/ext/%EXTNAME% diff --git a/cmake/ext/skeleton/cmake/modules/FindPHP.cmake b/cmake/ext/skeleton/cmake/modules/FindPHP.cmake index b22206dcf..c13fc5164 100644 --- a/cmake/ext/skeleton/cmake/modules/FindPHP.cmake +++ b/cmake/ext/skeleton/cmake/modules/FindPHP.cmake @@ -209,7 +209,7 @@ block(PROPAGATE PHP_VERSION) file( STRINGS ${PHP_INCLUDE_DIR}/main/php_version.h - php_version + result REGEX "${regex}" LIMIT_COUNT 1 ) diff --git a/cmake/ext/snmp/CMakeLists.txt b/cmake/ext/snmp/CMakeLists.txt index 4af694787..2106ae30b 100644 --- a/cmake/ext/snmp/CMakeLists.txt +++ b/cmake/ext/snmp/CMakeLists.txt @@ -51,19 +51,19 @@ if(NOT EXT_SNMP) endif() if(EXT_SNMP_SHARED) - add_library(php_snmp SHARED) + add_library(php_ext_snmp SHARED) else() - add_library(php_snmp) + add_library(php_ext_snmp) endif() target_sources( - php_snmp + php_ext_snmp PRIVATE snmp.c snmp.stub.php ) -add_dependencies(php_snmp php_spl) +add_dependencies(php_ext_snmp php_ext_spl) find_package(NetSnmp 5.3) set_package_properties( @@ -73,7 +73,7 @@ set_package_properties( PURPOSE "Necessary to enable the snmp extension." ) -target_link_libraries(php_snmp PRIVATE NetSnmp::NetSnmp) +target_link_libraries(php_ext_snmp PRIVATE NetSnmp::NetSnmp) if(TARGET NetSnmp::NetSnmp) cmake_push_check_state(RESET) diff --git a/cmake/ext/soap/CMakeLists.txt b/cmake/ext/soap/CMakeLists.txt index ae2633e12..87779bb07 100644 --- a/cmake/ext/soap/CMakeLists.txt +++ b/cmake/ext/soap/CMakeLists.txt @@ -49,13 +49,13 @@ if(NOT EXT_SOAP) endif() if(EXT_SOAP_SHARED) - add_library(php_soap SHARED) + add_library(php_ext_soap SHARED) else() - add_library(php_soap) + add_library(php_ext_soap) endif() target_sources( - php_soap + php_ext_soap PRIVATE php_encoding.c php_http.c @@ -68,7 +68,7 @@ target_sources( ) target_compile_definitions( - php_soap + php_ext_soap PRIVATE ZEND_ENABLE_STATIC_TSRMLS_CACHE $<$,$,MODULE_LIBRARY;SHARED_LIBRARY>>>:LIBXML_STATIC> @@ -83,12 +83,12 @@ set_package_properties( PURPOSE "Necessary to enable the soap extension." ) -target_link_libraries(php_soap PRIVATE LibXml2::LibXml2) +target_link_libraries(php_ext_soap PRIVATE LibXml2::LibXml2) -add_dependencies(php_soap php_hash php_libxml php_random) +add_dependencies(php_ext_soap php_ext_hash php_ext_libxml php_ext_random) if(EXT_SESSION) - add_dependencies(php_soap php_session) + add_dependencies(php_ext_soap php_ext_session) endif() set(HAVE_PHP_SOAP TRUE) diff --git a/cmake/ext/sockets/CMakeLists.txt b/cmake/ext/sockets/CMakeLists.txt index 5ea8d3c73..4030f75bc 100644 --- a/cmake/ext/sockets/CMakeLists.txt +++ b/cmake/ext/sockets/CMakeLists.txt @@ -54,13 +54,13 @@ if(NOT EXT_SOCKETS) endif() if(EXT_SOCKETS_SHARED) - add_library(php_sockets SHARED) + add_library(php_ext_sockets SHARED) else() - add_library(php_sockets) + add_library(php_ext_sockets) endif() target_sources( - php_sockets + php_ext_sockets PRIVATE conversions.c multicast.c @@ -76,7 +76,7 @@ target_sources( ) target_compile_definitions( - php_sockets + php_ext_sockets PRIVATE ZEND_ENABLE_STATIC_TSRMLS_CACHE $<$:__APPLE_USE_RFC_3542> @@ -84,7 +84,7 @@ target_compile_definitions( ) target_link_libraries( - php_sockets + php_ext_sockets PRIVATE $<$:ws2_32;iphlpapi> ) diff --git a/cmake/ext/sodium/CMakeLists.txt b/cmake/ext/sodium/CMakeLists.txt index 72f5f3389..5f37d113d 100644 --- a/cmake/ext/sodium/CMakeLists.txt +++ b/cmake/ext/sodium/CMakeLists.txt @@ -51,13 +51,13 @@ if(NOT EXT_SODIUM) endif() if(EXT_SODIUM_SHARED) - add_library(php_sodium SHARED) + add_library(php_ext_sodium SHARED) else() - add_library(php_sodium) + add_library(php_ext_sodium) endif() target_sources( - php_sodium + php_ext_sodium PRIVATE libsodium.c libsodium.stub.php @@ -76,18 +76,18 @@ set_package_properties( PURPOSE "Necessary to enable the sodium extension." ) -target_link_libraries(php_sodium PRIVATE Sodium::Sodium) +target_link_libraries(php_ext_sodium PRIVATE Sodium::Sodium) # Suppress some warnings on 32-bit with -Wno-type-limits and -Wno-logical-op. if(CMAKE_SIZEOF_VOID_P EQUAL 4) php_check_compiler_flag(C -Wno-type-limits HAVE_WNO_TYPE_LIMITS_C) if(HAVE_WNO_TYPE_LIMITS_C) - target_compile_options(php_sodium PRIVATE -Wno-type-limits) + target_compile_options(php_ext_sodium PRIVATE -Wno-type-limits) endif() php_check_compiler_flag(C -Wno-logical-op HAVE_WNO_LOGICAL_OP_C) if(HAVE_WNO_LOGICAL_OP_C) - target_compile_options(php_sodium PRIVATE -Wno-logical-op) + target_compile_options(php_ext_sodium PRIVATE -Wno-logical-op) endif() endif() diff --git a/cmake/ext/spl/CMakeLists.txt b/cmake/ext/spl/CMakeLists.txt index a4850cba9..f17c34d8e 100644 --- a/cmake/ext/spl/CMakeLists.txt +++ b/cmake/ext/spl/CMakeLists.txt @@ -7,7 +7,7 @@ This extension includes Standard PHP Library (SPL) and is always enabled. #]=============================================================================] project( - PhpExtensionSpl + php_ext_spl LANGUAGES C ) @@ -19,10 +19,10 @@ add_feature_info( "Standard PHP library (SPL)" ) -add_library(php_spl OBJECT) +add_library(php_ext_spl OBJECT) target_sources( - php_spl + php_ext_spl PRIVATE php_spl.c php_spl.stub.php @@ -59,6 +59,6 @@ target_sources( spl_observer.h ) -target_compile_definitions(php_spl PRIVATE ZEND_ENABLE_STATIC_TSRMLS_CACHE) +target_compile_definitions(php_ext_spl PRIVATE ZEND_ENABLE_STATIC_TSRMLS_CACHE) -add_dependencies(php_spl php_json php_pcre php_standard) +add_dependencies(php_ext_spl php_ext_json php_ext_pcre php_ext_standard) diff --git a/cmake/ext/sqlite3/CMakeLists.txt b/cmake/ext/sqlite3/CMakeLists.txt index e3518ab55..2e664b422 100644 --- a/cmake/ext/sqlite3/CMakeLists.txt +++ b/cmake/ext/sqlite3/CMakeLists.txt @@ -50,19 +50,19 @@ if(NOT EXT_SQLITE3) endif() if(EXT_SQLITE3_SHARED) - add_library(php_sqlite3 SHARED) + add_library(php_ext_sqlite3 SHARED) else() - add_library(php_sqlite3) + add_library(php_ext_sqlite3) endif() target_sources( - php_sqlite3 + php_ext_sqlite3 PRIVATE sqlite3.c sqlite3.stub.php ) -target_compile_definitions(php_sqlite3 PRIVATE ZEND_ENABLE_STATIC_TSRMLS_CACHE) +target_compile_definitions(php_ext_sqlite3 PRIVATE ZEND_ENABLE_STATIC_TSRMLS_CACHE) find_package(SQLite3 ${PHP_SQLITE_MIN_VERSION}) set_package_properties( @@ -72,7 +72,7 @@ set_package_properties( PURPOSE "Necessary to enable the sqlite3 extension." ) -target_link_libraries(php_sqlite3 PRIVATE SQLite::SQLite3) +target_link_libraries(php_ext_sqlite3 PRIVATE SQLite::SQLite3) if(TARGET SQLite::SQLite3) check_library_exists( diff --git a/cmake/ext/standard/CMakeLists.txt b/cmake/ext/standard/CMakeLists.txt index 378440009..f39d9cfb9 100644 --- a/cmake/ext/standard/CMakeLists.txt +++ b/cmake/ext/standard/CMakeLists.txt @@ -62,10 +62,10 @@ add_feature_info( # Add library. ################################################################################ -add_library(php_standard OBJECT) +add_library(php_ext_standard OBJECT) target_sources( - php_standard + php_ext_standard PRIVATE array.c assert.c @@ -204,22 +204,22 @@ target_sources( # Check for ARM64 processor on Windows. if(NOT CMAKE_SYSTEM_PROCESSOR STREQUAL "ARM64") - target_sources(php_standard PRIVATE crc32_x86.c) + target_sources(php_ext_standard PRIVATE crc32_x86.c) endif() target_include_directories( - php_standard + php_ext_standard PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/libavifinfo ) -target_compile_definitions(php_standard PRIVATE ZEND_ENABLE_STATIC_TSRMLS_CACHE) +target_compile_definitions(php_ext_standard PRIVATE ZEND_ENABLE_STATIC_TSRMLS_CACHE) # The standard extension depends on the generated Zend language parser. -add_dependencies(php_standard Zend::Zend) +add_dependencies(php_ext_standard Zend::Zend) target_link_libraries( - php_standard + php_ext_standard PRIVATE $<$:iphlpapi> ) @@ -230,14 +230,14 @@ target_link_libraries( if(RE2C_FOUND) re2c_target( - php_standard_var_unserializer + php_ext_standard_var_unserializer var_unserializer.re ${CMAKE_CURRENT_SOURCE_DIR}/var_unserializer.c OPTIONS -b ) re2c_target( - php_standard_url_scanner_ex + php_ext_standard_url_scanner_ex url_scanner_ex.re ${CMAKE_CURRENT_SOURCE_DIR}/url_scanner_ex.c OPTIONS -b @@ -257,7 +257,7 @@ if(EXT_STANDARD_ARGON2) PURPOSE "Necessary to include Argon2 support in password_*." ) - target_link_libraries(php_standard PRIVATE Argon2::Argon2) + target_link_libraries(php_ext_standard PRIVATE Argon2::Argon2) set(HAVE_ARGON2LIB TRUE) endif() @@ -268,7 +268,7 @@ endif() if(NOT EXT_STANDARD_CRYPT_EXTERNAL) target_sources( - php_standard + php_ext_standard PRIVATE crypt_blowfish.c crypt_freesec.c @@ -289,7 +289,7 @@ else() include(cmake/CheckCrypt.cmake) - target_link_libraries(php_standard PRIVATE Crypt::Crypt) + target_link_libraries(php_ext_standard PRIVATE Crypt::Crypt) endif() ################################################################################ @@ -358,7 +358,7 @@ php_search_libraries( network # Haiku VARIABLE _HAVE_GETIFADDRS LIBRARY_VARIABLE libraryForGetifaddrs - TARGET php_standard PRIVATE + TARGET php_ext_standard PRIVATE ) if(_HAVE_GETIFADDRS) @@ -409,7 +409,7 @@ php_search_libraries( LIBRARIES resolv # Solaris/illumos VARIABLE HAVE_DN_EXPAND - TARGET php_standard PRIVATE + TARGET php_ext_standard PRIVATE ) php_search_libraries( @@ -420,7 +420,7 @@ php_search_libraries( LIBRARIES resolv # Solaris/illumos VARIABLE HAVE_DN_SKIPNAME - TARGET php_standard PRIVATE + TARGET php_ext_standard PRIVATE ) # On macos the dn_skipname is defined as a macro but also requires resolv @@ -432,7 +432,7 @@ php_search_libraries( resolv.h LIBRARIES resolv # macOS - TARGET php_standard PRIVATE + TARGET php_ext_standard PRIVATE ) php_search_libraries( @@ -444,7 +444,7 @@ php_search_libraries( LIBRARIES resolv # Solaris/illumos, macOS VARIABLE HAVE_DNS_SEARCH - TARGET php_standard PRIVATE + TARGET php_ext_standard PRIVATE ) php_search_libraries( @@ -455,7 +455,7 @@ php_search_libraries( LIBRARIES resolv # Solaris/illumos VARIABLE HAVE_RES_NDESTROY - TARGET php_standard PRIVATE + TARGET php_ext_standard PRIVATE ) php_search_libraries( @@ -466,7 +466,7 @@ php_search_libraries( LIBRARIES resolv # Solaris/illumos VARIABLE HAVE_RES_NSEARCH - TARGET php_standard PRIVATE + TARGET php_ext_standard PRIVATE ) # res_search() is deprecated and should be replaced with res_nsearch(). @@ -478,7 +478,7 @@ php_search_libraries( LIBRARIES resolv # Solaris/illumos VARIABLE HAVE_RES_SEARCH - TARGET php_standard PRIVATE + TARGET php_ext_standard PRIVATE ) check_symbol_exists( @@ -516,12 +516,12 @@ block() ) add_custom_target( - php_standard_credits + php_ext_standard_credits DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/php_credits.timestamp ) - add_dependencies(php_standard php_standard_credits) + add_dependencies(php_ext_standard php_ext_standard_credits) endblock() ################################################################################ @@ -534,36 +534,36 @@ endblock() check_symbol_exists(chroot "unistd.h" HAVE_CHROOT) -add_library(php_standard_functions OBJECT) -add_library(php_standard_functions_cli OBJECT) +add_library(php_ext_standard_functions OBJECT) +add_library(php_ext_standard_functions_cli OBJECT) -target_sources(php_standard_functions PRIVATE basic_functions.c dir.c) -target_sources(php_standard_functions_cli PRIVATE basic_functions.c dir.c) +target_sources(php_ext_standard_functions PRIVATE basic_functions.c dir.c) +target_sources(php_ext_standard_functions_cli PRIVATE basic_functions.c dir.c) set_target_properties( - php_standard_functions - php_standard_functions_cli + php_ext_standard_functions + php_ext_standard_functions_cli PROPERTIES - INCLUDE_DIRECTORIES $ - COMPILE_DEFINITIONS $ - LINK_LIBRARIES $ + INCLUDE_DIRECTORIES $ + COMPILE_DEFINITIONS $ + LINK_LIBRARIES $ ) target_compile_definitions( - php_standard_functions_cli + php_ext_standard_functions_cli PRIVATE $<$>:ENABLE_CHROOT_FUNC> ) # ext/standard functions objects based on the SAPI type. target_sources( - php_standard + php_ext_standard INTERFACE - $>,$,$> + $>,$,$> ) -add_dependencies(php_standard_functions php_standard) -add_dependencies(php_standard_functions_cli php_standard) +add_dependencies(php_ext_standard_functions php_ext_standard) +add_dependencies(php_ext_standard_functions_cli php_ext_standard) ################################################################################ # Configuration header diff --git a/cmake/ext/sysvmsg/CMakeLists.txt b/cmake/ext/sysvmsg/CMakeLists.txt index fca03be8d..c4655a3a2 100644 --- a/cmake/ext/sysvmsg/CMakeLists.txt +++ b/cmake/ext/sysvmsg/CMakeLists.txt @@ -68,13 +68,13 @@ if(NOT _HAVE_SYS_MSG_H) endif() if(EXT_SYSVMSG_SHARED) - add_library(php_sysvmsg SHARED) + add_library(php_ext_sysvmsg SHARED) else() - add_library(php_sysvmsg) + add_library(php_ext_sysvmsg) endif() target_sources( - php_sysvmsg + php_ext_sysvmsg PRIVATE sysvmsg.c sysvmsg.stub.php diff --git a/cmake/ext/sysvsem/CMakeLists.txt b/cmake/ext/sysvsem/CMakeLists.txt index 5287cf6df..99578d942 100644 --- a/cmake/ext/sysvsem/CMakeLists.txt +++ b/cmake/ext/sysvsem/CMakeLists.txt @@ -58,13 +58,13 @@ if(NOT EXT_SYSVSEM) endif() if(EXT_SYSVSEM_SHARED) - add_library(php_sysvsem SHARED) + add_library(php_ext_sysvsem SHARED) else() - add_library(php_sysvsem) + add_library(php_ext_sysvsem) endif() target_sources( - php_sysvsem + php_ext_sysvsem PRIVATE sysvsem.c sysvsem.stub.php diff --git a/cmake/ext/sysvshm/CMakeLists.txt b/cmake/ext/sysvshm/CMakeLists.txt index 6cd3906e4..999752b77 100644 --- a/cmake/ext/sysvshm/CMakeLists.txt +++ b/cmake/ext/sysvshm/CMakeLists.txt @@ -49,13 +49,13 @@ if(NOT EXT_SYSVSHM) endif() if(EXT_SYSVSHM_SHARED) - add_library(php_sysvshm SHARED) + add_library(php_ext_sysvshm SHARED) else() - add_library(php_sysvshm) + add_library(php_ext_sysvshm) endif() target_sources( - php_sysvshm + php_ext_sysvshm PRIVATE sysvshm.c sysvshm.stub.php diff --git a/cmake/ext/tidy/CMakeLists.txt b/cmake/ext/tidy/CMakeLists.txt index ddc770336..0db6c53bd 100644 --- a/cmake/ext/tidy/CMakeLists.txt +++ b/cmake/ext/tidy/CMakeLists.txt @@ -52,13 +52,13 @@ if(NOT EXT_TIDY) endif() if(EXT_TIDY_SHARED) - add_library(php_tidy SHARED) + add_library(php_ext_tidy SHARED) else() - add_library(php_tidy) + add_library(php_ext_tidy) endif() target_sources( - php_tidy + php_ext_tidy PRIVATE php_tidy.def tidy.c @@ -74,11 +74,11 @@ if(Tidy_VERSION VERSION_LESS 5.7.20) HAVE_WNO_IGNORED_QUALIFIERS_C ) if(HAVE_WNO_IGNORED_QUALIFIERS_C) - target_compile_options(php_tidy PRIVATE -Wno-ignored-qualifiers) + target_compile_options(php_ext_tidy PRIVATE -Wno-ignored-qualifiers) endif() endif() -target_compile_definitions(php_tidy PRIVATE ZEND_ENABLE_STATIC_TSRMLS_CACHE) +target_compile_definitions(php_ext_tidy PRIVATE ZEND_ENABLE_STATIC_TSRMLS_CACHE) find_package(Tidy) set_package_properties( @@ -88,7 +88,7 @@ set_package_properties( PURPOSE "Necessary to enable the tidy extension." ) -target_link_libraries(php_tidy PRIVATE Tidy::Tidy) +target_link_libraries(php_ext_tidy PRIVATE Tidy::Tidy) if(TARGET Tidy::Tidy) check_library_exists(Tidy::Tidy tidyOptGetDoc "" HAVE_TIDYOPTGETDOC) diff --git a/cmake/ext/tokenizer/CMakeLists.txt b/cmake/ext/tokenizer/CMakeLists.txt index 02a75b2fc..c2e623c9f 100644 --- a/cmake/ext/tokenizer/CMakeLists.txt +++ b/cmake/ext/tokenizer/CMakeLists.txt @@ -22,7 +22,7 @@ Build extension as shared. #]=============================================================================] project( - PhpExtensionTokenizer + tokenizer LANGUAGES C ) @@ -51,13 +51,13 @@ if(NOT EXT_TOKENIZER) endif() if(EXT_TOKENIZER_SHARED) - add_library(php_tokenizer SHARED) + add_library(php_ext_tokenizer SHARED) else() - add_library(php_tokenizer) + add_library(php_ext_tokenizer) endif() target_sources( - php_tokenizer + php_ext_tokenizer PRIVATE tokenizer_data.c tokenizer_data.stub.php @@ -66,12 +66,12 @@ target_sources( ) # The tokenizer extension depends on the generated Zend scanner and parser. -add_dependencies(php_tokenizer Zend::Zend) +add_dependencies(php_ext_tokenizer Zend::Zend) # Generate tokenizer data source files. if(PHP_SOURCE_DIR) php_add_custom_command( - php_generate_tokenizer_data + php_ext_tokenizer_generate_data OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/tokenizer_data.stub.php ${CMAKE_CURRENT_SOURCE_DIR}/tokenizer_data.c diff --git a/cmake/ext/xml/CMakeLists.txt b/cmake/ext/xml/CMakeLists.txt index 49d2b2264..fc4a2d7a4 100644 --- a/cmake/ext/xml/CMakeLists.txt +++ b/cmake/ext/xml/CMakeLists.txt @@ -70,13 +70,13 @@ if(NOT EXT_XML) endif() if(EXT_XML_SHARED) - add_library(php_xml SHARED) + add_library(php_ext_xml SHARED) else() - add_library(php_xml) + add_library(php_ext_xml) endif() target_sources( - php_xml + php_ext_xml PRIVATE xml.c xml.stub.php @@ -87,7 +87,7 @@ target_sources( php_xml.h ) -target_compile_definitions(php_xml PRIVATE ZEND_ENABLE_STATIC_TSRMLS_CACHE) +target_compile_definitions(php_ext_xml PRIVATE ZEND_ENABLE_STATIC_TSRMLS_CACHE) if(NOT EXT_LIBXML AND NOT EXT_XML_EXPAT) message( @@ -98,10 +98,10 @@ if(NOT EXT_LIBXML AND NOT EXT_XML_EXPAT) endif() if(NOT EXT_XML_EXPAT) - target_sources(php_xml PRIVATE compat.c) + target_sources(php_ext_xml PRIVATE compat.c) target_compile_definitions( - php_xml + php_ext_xml PRIVATE # TODO: Fix LIBXML_STATIC usage based on the static/shared libxml2 package $<$,$,MODULE_LIBRARY;SHARED_LIBRARY>>>:LIBXML_STATIC> @@ -116,9 +116,9 @@ if(NOT EXT_XML_EXPAT) PURPOSE "Necessary to enable the xml extension." ) - target_link_libraries(php_xml PRIVATE LibXml2::LibXml2) + target_link_libraries(php_ext_xml PRIVATE LibXml2::LibXml2) - add_dependencies(php_xml php_libxml) + add_dependencies(php_ext_xml php_ext_libxml) else() find_package(EXPAT) set_package_properties( @@ -128,7 +128,7 @@ else() PURPOSE "Necessary to enable the xml extension." ) - target_link_libraries(php_xml PRIVATE EXPAT::EXPAT) + target_link_libraries(php_ext_xml PRIVATE EXPAT::EXPAT) set(HAVE_LIBEXPAT TRUE) endif() diff --git a/cmake/ext/xmlreader/CMakeLists.txt b/cmake/ext/xmlreader/CMakeLists.txt index b2ea1c7f0..5d3c38cf6 100644 --- a/cmake/ext/xmlreader/CMakeLists.txt +++ b/cmake/ext/xmlreader/CMakeLists.txt @@ -49,20 +49,20 @@ if(NOT EXT_XMLREADER) endif() if(EXT_XMLREADER_SHARED) - add_library(php_xmlreader SHARED) + add_library(php_ext_xmlreader SHARED) else() - add_library(php_xmlreader) + add_library(php_ext_xmlreader) endif() target_sources( - php_xmlreader + php_ext_xmlreader PRIVATE php_xmlreader.c php_xmlreader.stub.php ) target_compile_definitions( - php_xmlreader + php_ext_xmlreader PRIVATE # TODO: Fix LIBXML_STATIC usage based on the static/shared libxml2 package. $<$,$,MODULE_LIBRARY;SHARED_LIBRARY>>>:LIBXML_STATIC> @@ -77,14 +77,14 @@ set_package_properties( PURPOSE "Necessary to enable the xmlreader extension." ) -target_link_libraries(php_xmlreader PRIVATE LibXml2::LibXml2) +target_link_libraries(php_ext_xmlreader PRIVATE LibXml2::LibXml2) # Optional dependency. if(EXT_DOM) - add_dependencies(php_xmlreader php_dom) + add_dependencies(php_ext_xmlreader php_ext_dom) endif() -add_dependencies(php_xmlreader php_libxml) +add_dependencies(php_ext_xmlreader php_ext_libxml) set(HAVE_XMLREADER TRUE) diff --git a/cmake/ext/xmlwriter/CMakeLists.txt b/cmake/ext/xmlwriter/CMakeLists.txt index b286fb8e5..3147512e5 100644 --- a/cmake/ext/xmlwriter/CMakeLists.txt +++ b/cmake/ext/xmlwriter/CMakeLists.txt @@ -49,20 +49,20 @@ if(NOT EXT_XMLWRITER) endif() if(EXT_XMLWRITER_SHARED) - add_library(php_xmlwriter SHARED) + add_library(php_ext_xmlwriter SHARED) else() - add_library(php_xmlwriter) + add_library(php_ext_xmlwriter) endif() target_sources( - php_xmlwriter + php_ext_xmlwriter PRIVATE php_xmlwriter.c php_xmlwriter.stub.php ) target_compile_definitions( - php_xmlwriter + php_ext_xmlwriter PRIVATE # TODO: Fix LIBXML_STATIC usage based on the static/shared libxml2 package. $<$,$,MODULE_LIBRARY;SHARED_LIBRARY>>>:LIBXML_STATIC> @@ -77,11 +77,11 @@ set_package_properties( PURPOSE "Necessary to enable the xmlwriter extension." ) -target_link_libraries(php_xmlwriter PRIVATE LibXml2::LibXml2) +target_link_libraries(php_ext_xmlwriter PRIVATE LibXml2::LibXml2) # The libxml extension is not technically required for xmlwriter to work but it # ensures proper error reporting and support for streams. -add_dependencies(php_xmlwriter php_libxml) +add_dependencies(php_ext_xmlwriter php_ext_libxml) set(HAVE_XMLWRITER TRUE) diff --git a/cmake/ext/xsl/CMakeLists.txt b/cmake/ext/xsl/CMakeLists.txt index d2d1488a1..7b20196db 100644 --- a/cmake/ext/xsl/CMakeLists.txt +++ b/cmake/ext/xsl/CMakeLists.txt @@ -50,13 +50,13 @@ if(NOT EXT_XSL) endif() if(EXT_XSL_SHARED) - add_library(php_xsl SHARED) + add_library(php_ext_xsl SHARED) else() - add_library(php_xsl) + add_library(php_ext_xsl) endif() target_sources( - php_xsl + php_ext_xsl PRIVATE php_xsl.c php_xsl.stub.php @@ -64,7 +64,7 @@ target_sources( ) target_compile_definitions( - php_xsl + php_ext_xsl PRIVATE # TODO: Fix LIBXML_STATIC usage based on the static/shared libxml2 package. $<$,$,MODULE_LIBRARY;SHARED_LIBRARY>>>:DOM_EXPORTS;LIBXML_STATIC> @@ -73,7 +73,7 @@ target_compile_definitions( ) target_link_options( - php_xsl + php_ext_xsl PRIVATE $<$,$>:LINKER:/nodefaultlib:msvcrt> ) @@ -87,9 +87,9 @@ set_package_properties( PURPOSE "Necessary to enable the xsl extension." ) -target_link_libraries(php_xsl PRIVATE LibXml2::LibXml2) +target_link_libraries(php_ext_xsl PRIVATE LibXml2::LibXml2) -add_dependencies(php_xsl php_libxml php_dom) +add_dependencies(php_ext_xsl php_ext_libxml php_ext_dom) find_package(LibXslt 1.1.0) set_package_properties( @@ -99,15 +99,15 @@ set_package_properties( PURPOSE "Necessary to enable the xsl extension." ) -target_link_libraries(php_xsl PRIVATE LibXslt::LibXslt) +target_link_libraries(php_ext_xsl PRIVATE LibXslt::LibXslt) if(TARGET LibXslt::LibExslt) set(HAVE_XSL_EXSLT TRUE) - target_link_libraries(php_xsl PRIVATE LibXslt::LibExslt) + target_link_libraries(php_ext_xsl PRIVATE LibXslt::LibExslt) target_compile_definitions( - php_xsl + php_ext_xsl PRIVATE # TODO: Fix based on the static/shared xslt package. $<$:LIBEXSLT_STATIC> diff --git a/cmake/ext/zend_test/CMakeLists.txt b/cmake/ext/zend_test/CMakeLists.txt index ca5321617..f25b78019 100644 --- a/cmake/ext/zend_test/CMakeLists.txt +++ b/cmake/ext/zend_test/CMakeLists.txt @@ -49,13 +49,13 @@ if(NOT EXT_ZEND_TEST) endif() if(EXT_ZEND_TEST_SHARED) - add_library(php_zend_test SHARED) + add_library(php_ext_zend_test SHARED) else() - add_library(php_zend_test) + add_library(php_ext_zend_test) endif() target_sources( - php_zend_test + php_ext_zend_test PRIVATE fiber.c fiber.stub.php @@ -69,7 +69,7 @@ target_sources( ) target_compile_definitions( - php_zend_test + php_ext_zend_test PRIVATE ZEND_ENABLE_STATIC_TSRMLS_CACHE # TODO: PHP_ZEND_TEST_EXPORTS is currently unused. @@ -88,5 +88,5 @@ if(EXT_LIBXML) PURPOSE "Necessary to add XML support to zend_test extension." ) - target_link_libraries(php_zend_test PRIVATE LibXml2::LibXml2) + target_link_libraries(php_ext_zend_test PRIVATE LibXml2::LibXml2) endif() diff --git a/cmake/ext/zip/CMakeLists.txt b/cmake/ext/zip/CMakeLists.txt index 3e9ec4e52..7d37b4876 100644 --- a/cmake/ext/zip/CMakeLists.txt +++ b/cmake/ext/zip/CMakeLists.txt @@ -50,20 +50,20 @@ if(NOT EXT_ZIP) endif() if(EXT_ZIP_SHARED) - add_library(php_zip SHARED) + add_library(php_ext_zip SHARED) else() - add_library(php_zip) + add_library(php_ext_zip) endif() target_sources( - php_zip + php_ext_zip PRIVATE php_zip.c php_zip.stub.php zip_stream.c ) -add_dependencies(php_zip php_pcre) +add_dependencies(php_ext_zip php_ext_pcre) find_package(libzip 1.7.1) set_package_properties( @@ -88,7 +88,7 @@ if(libzip_VERSION VERSION_EQUAL 1.3.1 OR libzip_VERSION VERSION_EQUAL 1.7.0) ) endif() -target_link_libraries(php_zip PRIVATE libzip::libzip) +target_link_libraries(php_ext_zip PRIVATE libzip::libzip) # Note: ZIP_STATIC needs to be defined when using static libzip on Windows only # since version 1.0 to 1.3.2 diff --git a/cmake/ext/zlib/CMakeLists.txt b/cmake/ext/zlib/CMakeLists.txt index 30f7e92e4..0674750e7 100644 --- a/cmake/ext/zlib/CMakeLists.txt +++ b/cmake/ext/zlib/CMakeLists.txt @@ -50,13 +50,13 @@ if(NOT EXT_ZLIB) endif() if(EXT_ZLIB_SHARED) - add_library(php_zlib SHARED) + add_library(php_ext_zlib SHARED) else() - add_library(php_zlib) + add_library(php_ext_zlib) endif() target_sources( - php_zlib + php_ext_zlib PRIVATE $<$,$,MODULE_LIBRARY;SHARED_LIBRARY>>>:php_zlib.def> zlib_filter.c @@ -65,7 +65,7 @@ target_sources( zlib.stub.php ) -target_compile_definitions(php_zlib PRIVATE ZEND_ENABLE_STATIC_TSRMLS_CACHE) +target_compile_definitions(php_ext_zlib PRIVATE ZEND_ENABLE_STATIC_TSRMLS_CACHE) find_package(ZLIB ${PHP_ZLIB_MIN_VERSION}) set_package_properties( @@ -75,7 +75,7 @@ set_package_properties( PURPOSE "Necessary to enable the zlib extension." ) -target_link_libraries(php_zlib PRIVATE ZLIB::ZLIB) +target_link_libraries(php_ext_zlib PRIVATE ZLIB::ZLIB) set(HAVE_ZLIB TRUE) diff --git a/cmake/main/CMakeLists.txt b/cmake/main/CMakeLists.txt index 68e6f5f26..2ca9ee274 100644 --- a/cmake/main/CMakeLists.txt +++ b/cmake/main/CMakeLists.txt @@ -145,7 +145,7 @@ block() get_property(extensions GLOBAL PROPERTY PHP_EXTENSIONS) foreach(extension IN LISTS extensions) # Skip if extension is shared. - get_target_property(type php_${extension} TYPE) + get_target_property(type php_ext_${extension} TYPE) if(type MATCHES "^(MODULE|SHARED)_LIBRARY$") continue() endif() @@ -160,13 +160,13 @@ block() cmake_path(GET header FILENAME filename) set(code "#include \"ext/${extension}/${filename}\"\n") string(APPEND includesCli "${code}") - string(APPEND includes "$<$>>>:${code}>") + string(APPEND includes "$<$>>>:${code}>") endif() endforeach() set(code "\n\tphpext_${extension}_ptr,") set(pointersCli "${pointersCli}${code}") - set(pointers "${pointers}$<$>>>:${code}>") + set(pointers "${pointers}$<$>>>:${code}>") endforeach() cmake_path( diff --git a/cmake/sapi/cli/CMakeLists.txt b/cmake/sapi/cli/CMakeLists.txt index 452feddcd..18c248d04 100644 --- a/cmake/sapi/cli/CMakeLists.txt +++ b/cmake/sapi/cli/CMakeLists.txt @@ -126,7 +126,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows") target_link_libraries( php_sapi_cli PRIVATE - $<$,$,MODULE_LIBRARY;SHARED_LIBRARY>>>:$> + $<$,$,MODULE_LIBRARY;SHARED_LIBRARY>>>:$> ) endif()