diff --git a/cmake/Zend/cmake/MaxExecutionTimers.cmake b/cmake/Zend/cmake/MaxExecutionTimers.cmake index 767e3d4e8..4370612d3 100644 --- a/cmake/Zend/cmake/MaxExecutionTimers.cmake +++ b/cmake/Zend/cmake/MaxExecutionTimers.cmake @@ -58,10 +58,10 @@ endif() if(ZEND_MAX_EXECUTION_TIMERS AND CMAKE_SYSTEM_NAME STREQUAL "Linux") php_search_libraries( timer_create - HAVE_TIMER_CREATE HEADERS time.h LIBRARIES rt # Solaris <= 10, older Linux + VARIABLE HAVE_TIMER_CREATE LIBRARY_VARIABLE libraryForTimerCreate ) diff --git a/cmake/cmake/ConfigureChecks.cmake b/cmake/cmake/ConfigureChecks.cmake index e390edcdb..e48fe7948 100644 --- a/cmake/cmake/ConfigureChecks.cmake +++ b/cmake/cmake/ConfigureChecks.cmake @@ -510,16 +510,14 @@ endif() php_search_libraries( dlopen - HAVE_LIBDL HEADERS dlfcn.h - LIBRARIES - ${CMAKE_DL_LIBS} + LIBRARIES ${CMAKE_DL_LIBS} + VARIABLE HAVE_LIBDL TARGET php_configuration INTERFACE ) php_search_libraries( sin - HAVE_SIN HEADERS math.h LIBRARIES m TARGET php_configuration INTERFACE @@ -536,7 +534,6 @@ endif() # The socket() is mostly in C library (Solaris 11.4...) php_search_libraries( socket - HAVE_SOCKET HEADERS sys/socket.h winsock.h @@ -550,31 +547,30 @@ php_search_libraries( # The socketpair() is mostly in C library (Solaris 11.4...), except Windows. php_search_libraries( socketpair - HAVE_SOCKETPAIR HEADERS sys/socket.h LIBRARIES socket # Solaris <= 11.3, illumos network # Haiku + VARIABLE HAVE_SOCKETPAIR TARGET php_configuration INTERFACE ) # The gethostname() is mostly in C library (Solaris/illumos...) php_search_libraries( gethostname - HAVE_GETHOSTNAME HEADERS unistd.h winsock.h LIBRARIES network # Haiku ws2_32 # Windows + VARIABLE HAVE_GETHOSTNAME TARGET php_configuration INTERFACE ) # The gethostbyaddr() is mostly in C library (Solaris 11.4...) php_search_libraries( gethostbyaddr - HAVE_GETHOSTBYADDR HEADERS netdb.h sys/socket.h @@ -590,7 +586,6 @@ php_search_libraries( # and illumos don't have it. php_search_libraries( openpty - HAVE_OPENPTY HEADERS pty.h libutil.h # FreeBSD @@ -599,24 +594,24 @@ php_search_libraries( LIBRARIES util # Some BSD-based systems bsd # Haiku + VARIABLE HAVE_OPENPTY TARGET php_configuration INTERFACE ) # The inet_ntoa() is mostly in C library (Solaris 11.4, illumos...) php_search_libraries( inet_ntoa - HAVE_INET_NTOA HEADERS arpa/inet.h LIBRARIES nsl # Solaris <= 11.3 network # Haiku + VARIABLE HAVE_INET_NTOA TARGET php_configuration INTERFACE ) # The inet_ntop() is mostly in C library (Solaris 11.4, illumos, BSD*, Linux...) php_search_libraries( inet_ntop - HAVE_INET_NTOP HEADERS arpa/inet.h ws2tcpip.h @@ -625,6 +620,7 @@ php_search_libraries( resolv # Solaris 2.6..7 network # Haiku ws2_32 # Windows + VARIABLE HAVE_INET_NTOP TARGET php_configuration INTERFACE ) if(NOT HAVE_INET_NTOP) @@ -634,7 +630,6 @@ endif() # The inet_pton() is mostly in C library (Solaris 11.4, illumos...) php_search_libraries( inet_pton - HAVE_INET_PTON HEADERS arpa/inet.h ws2tcpip.h @@ -643,13 +638,13 @@ php_search_libraries( resolv # Solaris 2.6..7 network # Haiku ws2_32 # Windows + VARIABLE HAVE_INET_PTON TARGET php_configuration INTERFACE ) # The inet_aton() is mostly in C library (Solaris 11.4, illumos...) php_search_libraries( inet_aton - HAVE_INET_ATON HEADERS sys/socket.h netinet/in.h @@ -658,24 +653,24 @@ php_search_libraries( nsl # Solaris <= 11.3 resolv # Solaris 2.6..7 network # Haiku + VARIABLE HAVE_INET_ATON TARGET php_configuration INTERFACE ) # The nanosleep is mostly in C library (Solaris 11, illumos...) php_search_libraries( nanosleep - HAVE_NANOSLEEP HEADERS time.h LIBRARIES rt # Solaris <= 10 + VARIABLE HAVE_NANOSLEEP TARGET php_configuration INTERFACE ) # The setsockopt() is mostly in C library (Solaris 11.4...) php_search_libraries( setsockopt - HAVE_SETSOCKOPT HEADERS sys/types.h sys/socket.h @@ -690,18 +685,17 @@ php_search_libraries( # The gai_strerror() is mostly in C library (Solaris 11.4...) php_search_libraries( gai_strerror - HAVE_GAI_STRERROR HEADERS netdb.h LIBRARIES socket # Solaris <= 11.3, illumos network # Haiku + VARIABLE HAVE_GAI_STRERROR TARGET php_configuration INTERFACE ) # The getprotobyname() is mostly in C library (Solaris 11.4...) php_search_libraries( getprotobyname - HAVE_GETPROTOBYNAME HEADERS netdb.h winsock.h @@ -709,13 +703,13 @@ php_search_libraries( socket # Solaris <= 11.3, illumos network # Haiku ws2_32 # Windows + VARIABLE HAVE_GETPROTOBYNAME TARGET php_configuration INTERFACE ) # The getprotobynumber() is mostly in C library (Solaris 11.4...) php_search_libraries( getprotobynumber - HAVE_GETPROTOBYNUMBER HEADERS netdb.h winsock.h @@ -723,13 +717,13 @@ php_search_libraries( socket # Solaris <= 11.3, illumos network # Haiku ws2_32 # Windows + VARIABLE HAVE_GETPROTOBYNUMBER TARGET php_configuration INTERFACE ) # The getservbyname() is mostly in C library (Solaris 11.4...) php_search_libraries( getservbyname - HAVE_GETSERVBYNAME HEADERS netdb.h winsock.h @@ -737,13 +731,13 @@ php_search_libraries( socket # Solaris <= 11.3, illumos network # Haiku ws2_32 # Windows + VARIABLE HAVE_GETSERVBYNAME TARGET php_configuration INTERFACE ) # The getservbyport() is mostly in C library (Solaris 11.4...) php_search_libraries( getservbyport - HAVE_GETSERVBYPORT HEADERS netdb.h winsock.h @@ -751,13 +745,13 @@ php_search_libraries( socket # Solaris <= 11.3, illumos network # Haiku ws2_32 # Windows + VARIABLE HAVE_GETSERVBYPORT TARGET php_configuration INTERFACE ) # The shutdown() is mostly in C library (Solaris 11.4...) php_search_libraries( shutdown - HAVE_SHUTDOWN HEADERS sys/socket.h winsock.h @@ -765,6 +759,7 @@ php_search_libraries( socket # Solaris <= 11.3, illumos network # Haiku ws2_32 # Windows + VARIABLE HAVE_SHUTDOWN TARGET php_configuration INTERFACE ) diff --git a/cmake/cmake/modules/FindACL.cmake b/cmake/cmake/modules/FindACL.cmake index 274b3fcb3..0c88fed49 100644 --- a/cmake/cmake/modules/FindACL.cmake +++ b/cmake/cmake/modules/FindACL.cmake @@ -1,4 +1,6 @@ #[=============================================================================[ +# FindACL + Find the ACL library. Module defines the following `IMPORTED` target(s): diff --git a/cmake/cmake/modules/FindApache.cmake b/cmake/cmake/modules/FindApache.cmake index e0b3e6e94..6cad7a855 100644 --- a/cmake/cmake/modules/FindApache.cmake +++ b/cmake/cmake/modules/FindApache.cmake @@ -1,4 +1,6 @@ #[=============================================================================[ +# FindApache + Find the Apache packages and tools. The Apache development package usually contains Apache header files, the `apr` diff --git a/cmake/cmake/modules/FindAppArmor.cmake b/cmake/cmake/modules/FindAppArmor.cmake index e0e3c9dcf..fa3849780 100644 --- a/cmake/cmake/modules/FindAppArmor.cmake +++ b/cmake/cmake/modules/FindAppArmor.cmake @@ -1,4 +1,6 @@ #[=============================================================================[ +# FindAppArmor + Find the AppArmor library. Module defines the following `IMPORTED` target(s): diff --git a/cmake/cmake/modules/FindArgon2.cmake b/cmake/cmake/modules/FindArgon2.cmake index be408c51d..8f0689731 100644 --- a/cmake/cmake/modules/FindArgon2.cmake +++ b/cmake/cmake/modules/FindArgon2.cmake @@ -1,4 +1,6 @@ #[=============================================================================[ +# FindArgon2 + Find the Argon2 library. Module defines the following `IMPORTED` target(s): diff --git a/cmake/cmake/modules/FindAspell.cmake b/cmake/cmake/modules/FindAspell.cmake index e4b1472b5..349a5e286 100644 --- a/cmake/cmake/modules/FindAspell.cmake +++ b/cmake/cmake/modules/FindAspell.cmake @@ -1,4 +1,6 @@ #[=============================================================================[ +# FindAspell + Find the GNU Aspell library. In the past, there was a pspell library, which has been superseded by GNU's diff --git a/cmake/cmake/modules/FindAtomic.cmake b/cmake/cmake/modules/FindAtomic.cmake index 732dfe37a..9fbd44cbe 100644 --- a/cmake/cmake/modules/FindAtomic.cmake +++ b/cmake/cmake/modules/FindAtomic.cmake @@ -1,4 +1,6 @@ #[=============================================================================[ +# FindAtomic + Find the atomic instructions. Module defines the following `IMPORTED` target(s): diff --git a/cmake/cmake/modules/FindBerkeleyDB.cmake b/cmake/cmake/modules/FindBerkeleyDB.cmake index f2bdf60f0..69108fccd 100644 --- a/cmake/cmake/modules/FindBerkeleyDB.cmake +++ b/cmake/cmake/modules/FindBerkeleyDB.cmake @@ -1,4 +1,6 @@ #[=============================================================================[ +# FindBerkeleyDB + Find the Berkeley DB library. Module defines the following `IMPORTED` target(s): diff --git a/cmake/cmake/modules/FindCapstone.cmake b/cmake/cmake/modules/FindCapstone.cmake index d1a5a265c..1824ad6b0 100644 --- a/cmake/cmake/modules/FindCapstone.cmake +++ b/cmake/cmake/modules/FindCapstone.cmake @@ -1,4 +1,6 @@ #[=============================================================================[ +# FindCapstone + Find the Capstone library. Module defines the following `IMPORTED` target(s): diff --git a/cmake/cmake/modules/FindCcache.cmake b/cmake/cmake/modules/FindCcache.cmake index 4748c3082..83dab8e29 100644 --- a/cmake/cmake/modules/FindCcache.cmake +++ b/cmake/cmake/modules/FindCcache.cmake @@ -1,4 +1,6 @@ #[=============================================================================[ +# FindCcache + Find the Ccache compiler cache tool for faster compilation times. ## Result variables diff --git a/cmake/cmake/modules/FindCclient.cmake b/cmake/cmake/modules/FindCclient.cmake index 4afead01b..2b5b25b65 100644 --- a/cmake/cmake/modules/FindCclient.cmake +++ b/cmake/cmake/modules/FindCclient.cmake @@ -1,4 +1,6 @@ #[=============================================================================[ +# FindCclient + Find the IMAP c-client library. Also called UW-IMAP library was once maintained by the Washington University. diff --git a/cmake/cmake/modules/FindCdb.cmake b/cmake/cmake/modules/FindCdb.cmake index 13170c994..3280a3a3b 100644 --- a/cmake/cmake/modules/FindCdb.cmake +++ b/cmake/cmake/modules/FindCdb.cmake @@ -1,4 +1,6 @@ #[=============================================================================[ +# FindCdb + Find the cdb library. Module defines the following `IMPORTED` target(s): diff --git a/cmake/cmake/modules/FindCrypt.cmake b/cmake/cmake/modules/FindCrypt.cmake index d571dc827..0aae5cecf 100644 --- a/cmake/cmake/modules/FindCrypt.cmake +++ b/cmake/cmake/modules/FindCrypt.cmake @@ -1,4 +1,6 @@ #[=============================================================================[ +# FindCrypt + Find the crypt library and run a set of PHP-specific checks if library works. The Crypt library can be on some systems part of the standard C library. The diff --git a/cmake/cmake/modules/FindDTrace.cmake b/cmake/cmake/modules/FindDTrace.cmake index c42255e09..657ba1206 100644 --- a/cmake/cmake/modules/FindDTrace.cmake +++ b/cmake/cmake/modules/FindDTrace.cmake @@ -1,4 +1,6 @@ #[=============================================================================[ +# FindDtrace + Find DTrace. ## Result variables diff --git a/cmake/cmake/modules/FindDbm.cmake b/cmake/cmake/modules/FindDbm.cmake index 57a238c30..a8e870810 100644 --- a/cmake/cmake/modules/FindDbm.cmake +++ b/cmake/cmake/modules/FindDbm.cmake @@ -1,4 +1,6 @@ #[=============================================================================[ +# FindDbm + Find the dbm library. Depending on the system, the dbm library can be part of other libraries as an diff --git a/cmake/cmake/modules/FindDmalloc.cmake b/cmake/cmake/modules/FindDmalloc.cmake index 61701b67d..6c2dd431f 100644 --- a/cmake/cmake/modules/FindDmalloc.cmake +++ b/cmake/cmake/modules/FindDmalloc.cmake @@ -1,4 +1,6 @@ #[=============================================================================[ +# FindDmalloc + Find the Dmalloc library. Module defines the following `IMPORTED` target(s): diff --git a/cmake/cmake/modules/FindEditline.cmake b/cmake/cmake/modules/FindEditline.cmake index 925cfed5f..b351092b6 100644 --- a/cmake/cmake/modules/FindEditline.cmake +++ b/cmake/cmake/modules/FindEditline.cmake @@ -1,4 +1,6 @@ #[=============================================================================[ +# FindEditline + Find the Editline library. Module defines the following `IMPORTED` target(s): diff --git a/cmake/cmake/modules/FindEnchant.cmake b/cmake/cmake/modules/FindEnchant.cmake index ba00fb4f6..7b39784a4 100644 --- a/cmake/cmake/modules/FindEnchant.cmake +++ b/cmake/cmake/modules/FindEnchant.cmake @@ -1,4 +1,6 @@ #[=============================================================================[ +# FindEnchant + Find the Enchant library. Enchant uses different library names based on the version - `enchant-2` for diff --git a/cmake/cmake/modules/FindFFI.cmake b/cmake/cmake/modules/FindFFI.cmake index abd770716..cfe54b55f 100644 --- a/cmake/cmake/modules/FindFFI.cmake +++ b/cmake/cmake/modules/FindFFI.cmake @@ -1,4 +1,6 @@ #[=============================================================================[ +# FindFFI + Find the FFI library. Module defines the following `IMPORTED` target(s): diff --git a/cmake/cmake/modules/FindFirebird.cmake b/cmake/cmake/modules/FindFirebird.cmake index 296d26281..66fd6f499 100644 --- a/cmake/cmake/modules/FindFirebird.cmake +++ b/cmake/cmake/modules/FindFirebird.cmake @@ -1,4 +1,6 @@ #[=============================================================================[ +# FindFirebird + Find the Firebird library. Module defines the following `IMPORTED` target(s): diff --git a/cmake/cmake/modules/FindFreeTDS.cmake b/cmake/cmake/modules/FindFreeTDS.cmake index 9636dd15f..9c418020a 100644 --- a/cmake/cmake/modules/FindFreeTDS.cmake +++ b/cmake/cmake/modules/FindFreeTDS.cmake @@ -1,4 +1,6 @@ #[=============================================================================[ +# FindFreeTDS + Find the FreeTDS set of libraries. Module defines the following `IMPORTED` target(s): diff --git a/cmake/cmake/modules/FindGD.cmake b/cmake/cmake/modules/FindGD.cmake index b9ab729d4..b9eb04e6f 100644 --- a/cmake/cmake/modules/FindGD.cmake +++ b/cmake/cmake/modules/FindGD.cmake @@ -1,4 +1,6 @@ #[=============================================================================[ +# FindGD + Find the GD library. Module defines the following `IMPORTED` target(s): diff --git a/cmake/cmake/modules/FindGDBM.cmake b/cmake/cmake/modules/FindGDBM.cmake index 99d6f985f..437bf759d 100644 --- a/cmake/cmake/modules/FindGDBM.cmake +++ b/cmake/cmake/modules/FindGDBM.cmake @@ -1,4 +1,6 @@ #[=============================================================================[ +# FindGDBM + Find the GDBM library. Module defines the following `IMPORTED` target(s): diff --git a/cmake/cmake/modules/FindGMP.cmake b/cmake/cmake/modules/FindGMP.cmake index da9a69b32..1e73e7226 100644 --- a/cmake/cmake/modules/FindGMP.cmake +++ b/cmake/cmake/modules/FindGMP.cmake @@ -1,4 +1,6 @@ #[=============================================================================[ +# FindGMP + Find the GMP library. Module defines the following `IMPORTED` target(s): diff --git a/cmake/cmake/modules/FindGcov.cmake b/cmake/cmake/modules/FindGcov.cmake index b7f879fea..7a986b763 100644 --- a/cmake/cmake/modules/FindGcov.cmake +++ b/cmake/cmake/modules/FindGcov.cmake @@ -1,4 +1,6 @@ #[=============================================================================[ +# FindGcov + Find the Gcov coverage programs and features. Module defines the following `IMPORTED` target(s): diff --git a/cmake/cmake/modules/FindICU.cmake b/cmake/cmake/modules/FindICU.cmake index 144efe637..83d233014 100644 --- a/cmake/cmake/modules/FindICU.cmake +++ b/cmake/cmake/modules/FindICU.cmake @@ -1,4 +1,6 @@ #[=============================================================================[ +# FindICU + Find the ICU library. See: https://cmake.org/cmake/help/latest/module/FindICU.html diff --git a/cmake/cmake/modules/FindIconv.cmake b/cmake/cmake/modules/FindIconv.cmake index 6359f9d3f..d6803f582 100644 --- a/cmake/cmake/modules/FindIconv.cmake +++ b/cmake/cmake/modules/FindIconv.cmake @@ -1,4 +1,6 @@ #[=============================================================================[ +# FindIconv + Find the Iconv library. See: https://cmake.org/cmake/help/latest/module/FindIconv.html diff --git a/cmake/cmake/modules/FindIntl.cmake b/cmake/cmake/modules/FindIntl.cmake index a04ea5e7d..559efc9df 100644 --- a/cmake/cmake/modules/FindIntl.cmake +++ b/cmake/cmake/modules/FindIntl.cmake @@ -1,4 +1,6 @@ #[=============================================================================[ +# FindIntl + Find the Intl library. Module overrides the upstream CMake `FindIntl` module with few customizations. diff --git a/cmake/cmake/modules/FindKerberos.cmake b/cmake/cmake/modules/FindKerberos.cmake index 27eddafba..b41418fc2 100644 --- a/cmake/cmake/modules/FindKerberos.cmake +++ b/cmake/cmake/modules/FindKerberos.cmake @@ -1,4 +1,6 @@ #[=============================================================================[ +# FindKerberos + Find the Kerberos library. ## Components diff --git a/cmake/cmake/modules/FindLDAP.cmake b/cmake/cmake/modules/FindLDAP.cmake index 23802f164..bdaad788c 100644 --- a/cmake/cmake/modules/FindLDAP.cmake +++ b/cmake/cmake/modules/FindLDAP.cmake @@ -1,4 +1,6 @@ #[=============================================================================[ +# FindLDAP + Find the LDAP library. ## Components diff --git a/cmake/cmake/modules/FindLMDB.cmake b/cmake/cmake/modules/FindLMDB.cmake index 93c405c93..6505ed6ec 100644 --- a/cmake/cmake/modules/FindLMDB.cmake +++ b/cmake/cmake/modules/FindLMDB.cmake @@ -1,4 +1,6 @@ #[=============================================================================[ +# FindLMDB + Find the LMDB library. Module defines the following `IMPORTED` target(s): diff --git a/cmake/cmake/modules/FindLibXslt.cmake b/cmake/cmake/modules/FindLibXslt.cmake index 29c4d81f4..ba03a1cc0 100644 --- a/cmake/cmake/modules/FindLibXslt.cmake +++ b/cmake/cmake/modules/FindLibXslt.cmake @@ -1,4 +1,6 @@ #[=============================================================================[ +# FindLibXslt + Find the XSLT library (LibXslt). See: https://cmake.org/cmake/help/latest/module/FindLibXslt.html diff --git a/cmake/cmake/modules/FindMC.cmake b/cmake/cmake/modules/FindMC.cmake index dc94c78a3..a3826fe38 100644 --- a/cmake/cmake/modules/FindMC.cmake +++ b/cmake/cmake/modules/FindMC.cmake @@ -1,4 +1,6 @@ #[=============================================================================[ +# FindMC + Find Windows compatible message compiler (mc.exe or windmc) command-line tool. Message compiler is installed on Windows as part of the Visual Studio or Windows diff --git a/cmake/cmake/modules/FindMM.cmake b/cmake/cmake/modules/FindMM.cmake index 09cc90b6e..feba27034 100644 --- a/cmake/cmake/modules/FindMM.cmake +++ b/cmake/cmake/modules/FindMM.cmake @@ -1,4 +1,6 @@ #[=============================================================================[ +# FindMM + Find the mm library. Module defines the following `IMPORTED` target(s): diff --git a/cmake/cmake/modules/FindMySQL.cmake b/cmake/cmake/modules/FindMySQL.cmake index a9db8cd61..e9c068076 100644 --- a/cmake/cmake/modules/FindMySQL.cmake +++ b/cmake/cmake/modules/FindMySQL.cmake @@ -1,4 +1,6 @@ #[=============================================================================[ +# FindMySQL + Find MySQL-compatible (MySQL, MariaDB, Percona, etc.) database. This is customized find module for PHP mysqli and pdo_mysql extensions. It diff --git a/cmake/cmake/modules/FindNdbm.cmake b/cmake/cmake/modules/FindNdbm.cmake index 00d017928..4a008df42 100644 --- a/cmake/cmake/modules/FindNdbm.cmake +++ b/cmake/cmake/modules/FindNdbm.cmake @@ -1,4 +1,6 @@ #[=============================================================================[ +# FindNdbm + Find the ndbm library. Depending on the system, the nbdm ("new" dbm) can be part of other libraries as diff --git a/cmake/cmake/modules/FindNetSnmp.cmake b/cmake/cmake/modules/FindNetSnmp.cmake index cabcb717f..b8ce9b2a0 100644 --- a/cmake/cmake/modules/FindNetSnmp.cmake +++ b/cmake/cmake/modules/FindNetSnmp.cmake @@ -1,4 +1,6 @@ #[=============================================================================[ +# FindNetSnmp + Find the Net-SNMP library. Module defines the following `IMPORTED` target(s): diff --git a/cmake/cmake/modules/FindODBC.cmake b/cmake/cmake/modules/FindODBC.cmake index 5910fc4d7..90e0f8442 100644 --- a/cmake/cmake/modules/FindODBC.cmake +++ b/cmake/cmake/modules/FindODBC.cmake @@ -1,4 +1,6 @@ #[=============================================================================[ +# FindODBC + Find the ODBC library. This module is based on the upstream diff --git a/cmake/cmake/modules/FindOniguruma.cmake b/cmake/cmake/modules/FindOniguruma.cmake index 6ad4dbb2e..4e899266b 100644 --- a/cmake/cmake/modules/FindOniguruma.cmake +++ b/cmake/cmake/modules/FindOniguruma.cmake @@ -1,4 +1,6 @@ #[=============================================================================[ +# FindOniguruma + Find the Oniguruma library. Module defines the following `IMPORTED` target(s): diff --git a/cmake/cmake/modules/FindPCRE.cmake b/cmake/cmake/modules/FindPCRE.cmake index 0bad86c6d..707ba3c8e 100644 --- a/cmake/cmake/modules/FindPCRE.cmake +++ b/cmake/cmake/modules/FindPCRE.cmake @@ -1,4 +1,6 @@ #[=============================================================================[ +# FindPCRE + Find the PCRE library. Module defines the following `IMPORTED` target(s): diff --git a/cmake/cmake/modules/FindPHPSystem.cmake b/cmake/cmake/modules/FindPHPSystem.cmake index 64b1ba204..7a1c948ad 100644 --- a/cmake/cmake/modules/FindPHPSystem.cmake +++ b/cmake/cmake/modules/FindPHPSystem.cmake @@ -1,4 +1,6 @@ #[=============================================================================[ +# FindPHPSystem + Find external PHP on the system, if installed. ## Result variables diff --git a/cmake/cmake/modules/FindQDBM.cmake b/cmake/cmake/modules/FindQDBM.cmake index 49bd3e059..3733be732 100644 --- a/cmake/cmake/modules/FindQDBM.cmake +++ b/cmake/cmake/modules/FindQDBM.cmake @@ -1,4 +1,6 @@ #[=============================================================================[ +# FindQDBM + Find the QDBM library. Module defines the following `IMPORTED` target(s): diff --git a/cmake/cmake/modules/FindRE2C.cmake b/cmake/cmake/modules/FindRE2C.cmake index 4e21b8a6c..640a33a96 100644 --- a/cmake/cmake/modules/FindRE2C.cmake +++ b/cmake/cmake/modules/FindRE2C.cmake @@ -1,4 +1,6 @@ #[=============================================================================[ +# FindRE2C + Find re2c. The minimum required version of re2c can be specified using the standard CMake diff --git a/cmake/cmake/modules/FindReadline.cmake b/cmake/cmake/modules/FindReadline.cmake index f7d148ddc..ba8e3c9a3 100644 --- a/cmake/cmake/modules/FindReadline.cmake +++ b/cmake/cmake/modules/FindReadline.cmake @@ -1,4 +1,6 @@ #[=============================================================================[ +# FindReadline + Find the GNU Readline library. Module defines the following `IMPORTED` target(s): diff --git a/cmake/cmake/modules/FindSASL.cmake b/cmake/cmake/modules/FindSASL.cmake index d9fdfe390..e3879412e 100644 --- a/cmake/cmake/modules/FindSASL.cmake +++ b/cmake/cmake/modules/FindSASL.cmake @@ -1,4 +1,6 @@ #[=============================================================================[ +# FindSASL + Find the SASL library. Module defines the following `IMPORTED` target(s): diff --git a/cmake/cmake/modules/FindSELinux.cmake b/cmake/cmake/modules/FindSELinux.cmake index 5b69e93d9..7bdc81ff4 100644 --- a/cmake/cmake/modules/FindSELinux.cmake +++ b/cmake/cmake/modules/FindSELinux.cmake @@ -1,4 +1,6 @@ #[=============================================================================[ +# FindSELinux + Find the SELinux library. Module defines the following `IMPORTED` target(s): diff --git a/cmake/cmake/modules/FindSendmail.cmake b/cmake/cmake/modules/FindSendmail.cmake index c08945f20..59f4f3053 100644 --- a/cmake/cmake/modules/FindSendmail.cmake +++ b/cmake/cmake/modules/FindSendmail.cmake @@ -1,4 +1,6 @@ #[=============================================================================[ +# FindSendmail + Find the `sendmail` program. ## Result variables diff --git a/cmake/cmake/modules/FindSodium.cmake b/cmake/cmake/modules/FindSodium.cmake index 35a25aa85..307b477dd 100644 --- a/cmake/cmake/modules/FindSodium.cmake +++ b/cmake/cmake/modules/FindSodium.cmake @@ -1,4 +1,6 @@ #[=============================================================================[ +# FindSodium + Find the Sodium library (libsodium). Module defines the following `IMPORTED` target(s): diff --git a/cmake/cmake/modules/FindSystemd.cmake b/cmake/cmake/modules/FindSystemd.cmake index 4d604bde9..ee5a16523 100644 --- a/cmake/cmake/modules/FindSystemd.cmake +++ b/cmake/cmake/modules/FindSystemd.cmake @@ -1,4 +1,6 @@ #[=============================================================================[ +# FindSystemd + Find the systemd library (libsystemd). Module defines the following `IMPORTED` target(s): diff --git a/cmake/cmake/modules/FindTidy.cmake b/cmake/cmake/modules/FindTidy.cmake index ff3ec2215..5dc4e2c9d 100644 --- a/cmake/cmake/modules/FindTidy.cmake +++ b/cmake/cmake/modules/FindTidy.cmake @@ -1,4 +1,6 @@ #[=============================================================================[ +# FindTidy + Find the Tidy library (tidy-html5, legacy htmltidy library, or the tidyp - obsolete fork). diff --git a/cmake/cmake/modules/FindTokyoCabinet.cmake b/cmake/cmake/modules/FindTokyoCabinet.cmake index 2169796d3..f06941720 100644 --- a/cmake/cmake/modules/FindTokyoCabinet.cmake +++ b/cmake/cmake/modules/FindTokyoCabinet.cmake @@ -1,4 +1,6 @@ #[=============================================================================[ +# FindTokyoCabinet + Find the Tokyo Cabinet library. Module defines the following `IMPORTED` target(s): diff --git a/cmake/cmake/modules/FindValgrind.cmake b/cmake/cmake/modules/FindValgrind.cmake index a8303f109..aeb074cb3 100644 --- a/cmake/cmake/modules/FindValgrind.cmake +++ b/cmake/cmake/modules/FindValgrind.cmake @@ -1,4 +1,6 @@ #[=============================================================================[ +# FindValgrind + Find Valgrind. Module defines the following `IMPORTED` target(s): diff --git a/cmake/cmake/modules/FindWebP.cmake b/cmake/cmake/modules/FindWebP.cmake index 6d420ae05..93748191c 100644 --- a/cmake/cmake/modules/FindWebP.cmake +++ b/cmake/cmake/modules/FindWebP.cmake @@ -1,4 +1,6 @@ #[=============================================================================[ +# FindWebP + Find the libwebp library. Module defines the following `IMPORTED` target(s): diff --git a/cmake/cmake/modules/FindXPM.cmake b/cmake/cmake/modules/FindXPM.cmake index aa5205c59..6af087b9f 100644 --- a/cmake/cmake/modules/FindXPM.cmake +++ b/cmake/cmake/modules/FindXPM.cmake @@ -1,4 +1,6 @@ #[=============================================================================[ +# FindXPM + Find the libXpm library. Module defines the following `IMPORTED` target(s): diff --git a/cmake/cmake/modules/Findlibavif.cmake b/cmake/cmake/modules/Findlibavif.cmake index 6d89f33c3..4df3fa96c 100644 --- a/cmake/cmake/modules/Findlibavif.cmake +++ b/cmake/cmake/modules/Findlibavif.cmake @@ -1,4 +1,6 @@ #[=============================================================================[ +# Findlibavif + Find the libavif library. This is a helper in case system doesn't have the library's Config find module. diff --git a/cmake/cmake/modules/Findlibzip.cmake b/cmake/cmake/modules/Findlibzip.cmake index b39af4b0f..c91fbdd76 100644 --- a/cmake/cmake/modules/Findlibzip.cmake +++ b/cmake/cmake/modules/Findlibzip.cmake @@ -1,4 +1,6 @@ #[=============================================================================[ +# Findlibzip + Find the libzip library. This is a helper in case system doesn't have the libzip's Config find module diff --git a/cmake/cmake/modules/PHP/AddCustomCommand.cmake b/cmake/cmake/modules/PHP/AddCustomCommand.cmake index 94e4c9b42..86c897ac2 100644 --- a/cmake/cmake/modules/PHP/AddCustomCommand.cmake +++ b/cmake/cmake/modules/PHP/AddCustomCommand.cmake @@ -1,4 +1,6 @@ #[=============================================================================[ +# PHP/AddCustomCommand + Add custom command. This module is built on top of the CMake diff --git a/cmake/cmake/modules/PHP/CheckAVX512.cmake b/cmake/cmake/modules/PHP/CheckAVX512.cmake index f32977ad7..65fe10161 100644 --- a/cmake/cmake/modules/PHP/CheckAVX512.cmake +++ b/cmake/cmake/modules/PHP/CheckAVX512.cmake @@ -1,4 +1,6 @@ #[=============================================================================[ +# PHP/CheckAVX512 + Check whether compiler supports AVX-512 extensions. Note that this is a compiler check, not a runtime check where further adjustments are done in the php-src C code to use these extensions. diff --git a/cmake/cmake/modules/PHP/CheckAttribute.cmake b/cmake/cmake/modules/PHP/CheckAttribute.cmake index 09fb13b6f..8381e46a4 100644 --- a/cmake/cmake/modules/PHP/CheckAttribute.cmake +++ b/cmake/cmake/modules/PHP/CheckAttribute.cmake @@ -1,4 +1,6 @@ #[=============================================================================[ +# PHP/CheckAttribute + Check if GNU C function or variable attribute is supported by the compiler. Module exposes the following functions: diff --git a/cmake/cmake/modules/PHP/CheckBrokenGccStrlenOpt.cmake b/cmake/cmake/modules/PHP/CheckBrokenGccStrlenOpt.cmake index 21b9ecdb7..50456e18e 100644 --- a/cmake/cmake/modules/PHP/CheckBrokenGccStrlenOpt.cmake +++ b/cmake/cmake/modules/PHP/CheckBrokenGccStrlenOpt.cmake @@ -1,4 +1,6 @@ #[=============================================================================[ +# PHP/CheckBrokenGccStrlenOpt + Early GCC 8 versions shipped with a strlen() optimization bug, so it didn't properly handle the `char val[1]` struct hack. Fixed in GCC 8.3. If below check is successful the -fno-optimize-strlen compiler flag should be added. diff --git a/cmake/cmake/modules/PHP/CheckBuiltin.cmake b/cmake/cmake/modules/PHP/CheckBuiltin.cmake index 7777a13cb..761b3e810 100644 --- a/cmake/cmake/modules/PHP/CheckBuiltin.cmake +++ b/cmake/cmake/modules/PHP/CheckBuiltin.cmake @@ -1,4 +1,6 @@ #[=============================================================================[ +# PHP/CheckBuiltin + Check whether compiler supports one of the built-in functions `__builtin_*()`. Module exposes the following function: diff --git a/cmake/cmake/modules/PHP/CheckByteOrder.cmake b/cmake/cmake/modules/PHP/CheckByteOrder.cmake index 26db55a4c..79473b860 100644 --- a/cmake/cmake/modules/PHP/CheckByteOrder.cmake +++ b/cmake/cmake/modules/PHP/CheckByteOrder.cmake @@ -1,4 +1,6 @@ #[=============================================================================[ +# PHP/CheckByteOrder + Check whether system byte ordering is big-endian. ## Cache variables diff --git a/cmake/cmake/modules/PHP/CheckCompilerFlag.cmake b/cmake/cmake/modules/PHP/CheckCompilerFlag.cmake index 126c6e082..d5841da21 100644 --- a/cmake/cmake/modules/PHP/CheckCompilerFlag.cmake +++ b/cmake/cmake/modules/PHP/CheckCompilerFlag.cmake @@ -1,4 +1,6 @@ #[=============================================================================[ +# PHP/CheckCompilerFlag + Check whether the compiler supports given compile option. CMake's `CheckCompilerFlag` module and its `check_compiler_flag()` macro, at the diff --git a/cmake/cmake/modules/PHP/CheckCopyFileRange.cmake b/cmake/cmake/modules/PHP/CheckCopyFileRange.cmake index e23982132..aea92c259 100644 --- a/cmake/cmake/modules/PHP/CheckCopyFileRange.cmake +++ b/cmake/cmake/modules/PHP/CheckCopyFileRange.cmake @@ -1,4 +1,6 @@ #[=============================================================================[ +# PHP/CheckCopyFileRange + On FreeBSD, `copy_file_range()` works only with the undocumented flag `0x01000000`. Until the problem is fixed properly, `copy_file_range()` is used only on Linux. diff --git a/cmake/cmake/modules/PHP/CheckFlushIo.cmake b/cmake/cmake/modules/PHP/CheckFlushIo.cmake index 8c699eb9f..eb55afd70 100644 --- a/cmake/cmake/modules/PHP/CheckFlushIo.cmake +++ b/cmake/cmake/modules/PHP/CheckFlushIo.cmake @@ -1,4 +1,6 @@ #[=============================================================================[ +# PHP/CheckFlushIo + Check if flush should be called explicitly after buffered io. ## Cache variables diff --git a/cmake/cmake/modules/PHP/CheckFopencookie.cmake b/cmake/cmake/modules/PHP/CheckFopencookie.cmake index a8c814900..31aba6274 100644 --- a/cmake/cmake/modules/PHP/CheckFopencookie.cmake +++ b/cmake/cmake/modules/PHP/CheckFopencookie.cmake @@ -1,4 +1,6 @@ #[=============================================================================[ +# PHP/CheckFopencookie + Check if `fopencookie()` works as expected. Module first checks if `fopencookie()` and type `cookie_io_functions_t` are diff --git a/cmake/cmake/modules/PHP/CheckGetaddrinfo.cmake b/cmake/cmake/modules/PHP/CheckGetaddrinfo.cmake index c441ffccf..222f461b4 100644 --- a/cmake/cmake/modules/PHP/CheckGetaddrinfo.cmake +++ b/cmake/cmake/modules/PHP/CheckGetaddrinfo.cmake @@ -1,4 +1,6 @@ #[=============================================================================[ +# PHP/CheckGetaddrinfo + Check for working `getaddrinfo()`. ## Cache variables @@ -24,7 +26,6 @@ message(CHECK_START "Checking for getaddrinfo()") # The getaddrinfo() is mostly in C library (Solaris 11.4, illumos...) php_search_libraries( getaddrinfo - _have_getaddrinfo_symbol HEADERS netdb.h ws2tcpip.h diff --git a/cmake/cmake/modules/PHP/CheckGethostbynameR.cmake b/cmake/cmake/modules/PHP/CheckGethostbynameR.cmake index 33253a869..335954a86 100644 --- a/cmake/cmake/modules/PHP/CheckGethostbynameR.cmake +++ b/cmake/cmake/modules/PHP/CheckGethostbynameR.cmake @@ -1,4 +1,6 @@ #[=============================================================================[ +# PHP/CheckGethostbynameR + Check `gethostbyname_r()`. The non-standard `gethostbyname_r()` function has different signatures across @@ -43,10 +45,10 @@ function(_php_check_gethostbyname_r) # mostly in the default libraries (C library) - Linux, Solaris 11.4... php_search_libraries( gethostbyname_r - _HAVE_GETHOSTBYNAME_R HEADERS netdb.h LIBRARIES nsl # Solaris <= 11.3, illumos + VARIABLE _HAVE_GETHOSTBYNAME_R LIBRARY_VARIABLE library ) if(NOT _HAVE_GETHOSTBYNAME_R) diff --git a/cmake/cmake/modules/PHP/CheckIPv6.cmake b/cmake/cmake/modules/PHP/CheckIPv6.cmake index a14f0cb6b..b63b621e9 100644 --- a/cmake/cmake/modules/PHP/CheckIPv6.cmake +++ b/cmake/cmake/modules/PHP/CheckIPv6.cmake @@ -1,4 +1,6 @@ #[=============================================================================[ +# PHP/CheckIPv6 + Check for IPv6 support. ## Cache variables diff --git a/cmake/cmake/modules/PHP/CheckInline.cmake b/cmake/cmake/modules/PHP/CheckInline.cmake index 30320a212..1287076cc 100644 --- a/cmake/cmake/modules/PHP/CheckInline.cmake +++ b/cmake/cmake/modules/PHP/CheckInline.cmake @@ -1,4 +1,6 @@ #[=============================================================================[ +# PHP/CheckInline + Check if compiler supports `inline`, `__inline__`, or `__inline` keyword. The `inline` keyword is part of the C99 standard and all decent compilers should diff --git a/cmake/cmake/modules/PHP/CheckReentrantFunctions.cmake b/cmake/cmake/modules/PHP/CheckReentrantFunctions.cmake index a21d5a58e..91da0061e 100644 --- a/cmake/cmake/modules/PHP/CheckReentrantFunctions.cmake +++ b/cmake/cmake/modules/PHP/CheckReentrantFunctions.cmake @@ -1,4 +1,6 @@ #[=============================================================================[ +# PHP/CheckReentrantFunctions + Check for reentrant functions and their declarations. Some systems didn't declare some reentrant functions if `_REENTRANT` was not diff --git a/cmake/cmake/modules/PHP/CheckSegmentsAlignment.cmake b/cmake/cmake/modules/PHP/CheckSegmentsAlignment.cmake index 0d8891e90..bf04c878b 100644 --- a/cmake/cmake/modules/PHP/CheckSegmentsAlignment.cmake +++ b/cmake/cmake/modules/PHP/CheckSegmentsAlignment.cmake @@ -1,4 +1,6 @@ #[=============================================================================[ +# PHP/CheckSegmentsAlignment + Check linker support for aligning segments on huge page boundary. #]=============================================================================] diff --git a/cmake/cmake/modules/PHP/CheckSysMacros.cmake b/cmake/cmake/modules/PHP/CheckSysMacros.cmake index 33e0ceb5c..6436ce1e9 100644 --- a/cmake/cmake/modules/PHP/CheckSysMacros.cmake +++ b/cmake/cmake/modules/PHP/CheckSysMacros.cmake @@ -1,4 +1,6 @@ #[=============================================================================[ +# PHP/CheckSysMacros + Check for non-standard `major`, `minor` and `makedev`. They can be defined as macros. On Solaris/illumos they are in `sys/mkdev.h` (macro definition to a libc implementation) and in `sys/sysmacros.h` (macro definition using binary diff --git a/cmake/cmake/modules/PHP/CheckTimeR.cmake b/cmake/cmake/modules/PHP/CheckTimeR.cmake index 022398cee..898e4b3bf 100644 --- a/cmake/cmake/modules/PHP/CheckTimeR.cmake +++ b/cmake/cmake/modules/PHP/CheckTimeR.cmake @@ -1,4 +1,6 @@ #[=============================================================================[ +# PHP/CheckTimeR + Check type of reentrant time-related functions. Type can be: irix, hpux or POSIX. diff --git a/cmake/cmake/modules/PHP/CheckWrite.cmake b/cmake/cmake/modules/PHP/CheckWrite.cmake index ca7f86ca3..9315e4dcc 100644 --- a/cmake/cmake/modules/PHP/CheckWrite.cmake +++ b/cmake/cmake/modules/PHP/CheckWrite.cmake @@ -1,4 +1,6 @@ #[=============================================================================[ +# PHP/CheckWrite + Check whether writing to stdout works. ## Cache variables diff --git a/cmake/cmake/modules/PHP/ConfigureFile.cmake b/cmake/cmake/modules/PHP/ConfigureFile.cmake index d7332f03b..3b0185d49 100644 --- a/cmake/cmake/modules/PHP/ConfigureFile.cmake +++ b/cmake/cmake/modules/PHP/ConfigureFile.cmake @@ -1,4 +1,6 @@ #[=============================================================================[ +# PHP/ConfigureFile + Wrapper built on top of CMake's `configure_file()`. There is a common issue with installation prefix not being applied when using diff --git a/cmake/cmake/modules/PHP/Extensions.cmake b/cmake/cmake/modules/PHP/Extensions.cmake index be4b06ea9..2e9ea0749 100644 --- a/cmake/cmake/modules/PHP/Extensions.cmake +++ b/cmake/cmake/modules/PHP/Extensions.cmake @@ -1,4 +1,6 @@ #[=============================================================================[ +# PHP/Extensions + Configure PHP extensions. This module is responsible for parsing `CMakeLists.txt` files of PHP extensions diff --git a/cmake/cmake/modules/PHP/FeatureSummary.cmake b/cmake/cmake/modules/PHP/FeatureSummary.cmake index f9864f28b..9a604890b 100644 --- a/cmake/cmake/modules/PHP/FeatureSummary.cmake +++ b/cmake/cmake/modules/PHP/FeatureSummary.cmake @@ -1,4 +1,6 @@ #[=============================================================================[ +# PHP/FeatureSummary + Print summary of enabled/disabled features. This is built on top of the CMake's `FeatureSummary` module. It sorts feature diff --git a/cmake/cmake/modules/PHP/Install.cmake b/cmake/cmake/modules/PHP/Install.cmake index 716cb2830..319f2b552 100644 --- a/cmake/cmake/modules/PHP/Install.cmake +++ b/cmake/cmake/modules/PHP/Install.cmake @@ -1,4 +1,6 @@ #[=============================================================================[ +# PHP/Install + Set the `CMAKE_INSTALL_*` variables inside the `install(CODE|SCRIPT)`. This is built on top of the CMake's diff --git a/cmake/cmake/modules/PHP/InterproceduralOptimization.cmake b/cmake/cmake/modules/PHP/InterproceduralOptimization.cmake index 38838d4f3..b016cfaed 100644 --- a/cmake/cmake/modules/PHP/InterproceduralOptimization.cmake +++ b/cmake/cmake/modules/PHP/InterproceduralOptimization.cmake @@ -1,4 +1,6 @@ #[=============================================================================[ +# PHP/InterproceduralOptimization + Enable interprocedural optimization (IPO), if supported. Interprocedural optimization adds linker flag `-flto` if it is supported by the diff --git a/cmake/cmake/modules/PHP/LinkWhatYouUse.cmake b/cmake/cmake/modules/PHP/LinkWhatYouUse.cmake index 0e6d95aa9..efdb7cd4b 100644 --- a/cmake/cmake/modules/PHP/LinkWhatYouUse.cmake +++ b/cmake/cmake/modules/PHP/LinkWhatYouUse.cmake @@ -1,4 +1,6 @@ #[=============================================================================[ +# PHP/LinkWhatYouUse + Check whether to enable `CMAKE_LINK_WHAT_YOU_USE`. When enabled, warnings are emitted during the build phase for diagnostic diff --git a/cmake/cmake/modules/PHP/PkgConfigGenerator.cmake b/cmake/cmake/modules/PHP/PkgConfigGenerator.cmake index f3b003fd5..3e8cc70af 100644 --- a/cmake/cmake/modules/PHP/PkgConfigGenerator.cmake +++ b/cmake/cmake/modules/PHP/PkgConfigGenerator.cmake @@ -1,4 +1,6 @@ #[=============================================================================[ +# PHP/PkgConfigGenerator + Generate pkg-config .pc file. CMake at the time of writing doesn't provide a solution to generate pkg-config diff --git a/cmake/cmake/modules/PHP/PositionIndependentCode.cmake b/cmake/cmake/modules/PHP/PositionIndependentCode.cmake index d8c2bb071..57dbbee14 100644 --- a/cmake/cmake/modules/PHP/PositionIndependentCode.cmake +++ b/cmake/cmake/modules/PHP/PositionIndependentCode.cmake @@ -1,4 +1,6 @@ #[=============================================================================[ +# PHP/PositionIndependentCode + Check whether to enable the `POSITION_INDEPENDENT_CODE` or not. https://cmake.org/cmake/help/latest/variable/CMAKE_POSITION_INDEPENDENT_CODE.html diff --git a/cmake/cmake/modules/PHP/Rebuild.cmake b/cmake/cmake/modules/PHP/Rebuild.cmake index dee98d864..d1046af3c 100644 --- a/cmake/cmake/modules/PHP/Rebuild.cmake +++ b/cmake/cmake/modules/PHP/Rebuild.cmake @@ -1,4 +1,6 @@ #[=============================================================================[ +# PHP/Rebuild + Ensure all project targets are rebuilt as needed. When PHP is not found on the system, the `php_cli` target is used to generate diff --git a/cmake/cmake/modules/PHP/SearchLibraries.cmake b/cmake/cmake/modules/PHP/SearchLibraries.cmake index 20e9499e8..8780c6737 100644 --- a/cmake/cmake/modules/PHP/SearchLibraries.cmake +++ b/cmake/cmake/modules/PHP/SearchLibraries.cmake @@ -1,4 +1,6 @@ #[=============================================================================[ +# PHP/SearchLibraries + Check if symbol exists in given header(s). If not found in default linked libraries (for example, C library), a given list of libraries is iterated and found library can be linked as needed. @@ -22,9 +24,9 @@ Module exposes the following function: ```cmake php_search_libraries( - HEADERS
... [LIBRARIES ...] + [VARIABLE ] [LIBRARY_VARIABLE ] [TARGET ] [RECHECK_HEADERS] @@ -32,8 +34,8 @@ php_search_libraries( ``` Check that the `` is available after including the `
` (or a list -of ``) and store the result in an internal cache variable -``. +of ``), or if any library from the `LIBRARY` list needs to be linked. +If `` is given, check result is stored in an internal cache variable. * `HEADERS` @@ -52,6 +54,12 @@ of ``) and store the result in an internal cache variable works when symbol might be a macro definition. It would not be found using the other two commands because they don't include required headers. +* `VARIABLE` + + Name of a cache variable where the check result will be stored. Optional. If + not given, the result will be stored in an internal automatically defined + cache variable name. + * `LIBRARY_VARIABLE` When symbol is not found in the default libraries, the resulting library that @@ -84,10 +92,9 @@ include(PHP/SearchLibraries) php_search_libraries( dlopen - HAVE_LIBDL HEADERS dlfcn.h - LIBRARIES - ${CMAKE_DL_LIBS} + LIBRARIES ${CMAKE_DL_LIBS} + VARIABLE HAVE_LIBDL TARGET php_configuration INTERFACE ) ``` @@ -156,29 +163,42 @@ endmacro() function(php_search_libraries) cmake_parse_arguments( PARSE_ARGV - 2 - parsed # prefix - "RECHECK_HEADERS" # options - "LIBRARY_VARIABLE" # one-value keywords - "HEADERS;LIBRARIES;TARGET" # multi-value keywords + 1 + parsed # prefix + "RECHECK_HEADERS" # options + "VARIABLE;LIBRARY_VARIABLE" # one-value keywords + "HEADERS;LIBRARIES;TARGET" # multi-value keywords ) if(parsed_UNPARSED_ARGUMENTS) message(FATAL_ERROR "Bad arguments: ${parsed_UNPARSED_ARGUMENTS}") endif() + if(NOT parsed_HEADERS) + message(FATAL_ERROR "php_search_libraries: missing HEADERS") + endif() + set(symbol ${ARGV0}) - set(symbolResultVariable ${ARGV1}) set(headers ${parsed_HEADERS}) set(recheckHeaders ${parsed_RECHECK_HEADERS}) set(libraries ${parsed_LIBRARIES}) - set(libraryResultVariable ${parsed_LIBRARY_VARIABLE}) - set(libraryInternalVariable _PHP_SEARCH_LIBRARIES_LIBRARY_${ARGV1}) - if(NOT parsed_HEADERS) - message(FATAL_ERROR "php_search_libraries: missing HEADERS") + if(NOT parsed_VARIABLE) + string( + MAKE_C_IDENTIFIER + "HAVE_${symbol}_${parsed_HEADERS}_${parsed_LIBRARIES}" + variableSuffix + ) + string(TOUPPER "${variableSuffix}" variableSuffix) + set(parsed_VARIABLE _PHP_SEARCH_LIBRARIES_${variableSuffix}) + else() + set(variableSuffix ${parsed_VARIABLE}) endif() + set(symbolResultVariable ${parsed_VARIABLE}) + set(libraryResultVariable ${parsed_LIBRARY_VARIABLE}) + set(libraryInternalVariable _PHP_SEARCH_LIBRARIES_LIBRARY_${variableSuffix}) + # Clear LIBRARY_VARIABLE of any existing value if set in the parent scope. if(${libraryResultVariable}) unset(${libraryResultVariable} PARENT_SCOPE) diff --git a/cmake/cmake/modules/PHP/Set.cmake b/cmake/cmake/modules/PHP/Set.cmake index 879460fef..e2515d0ef 100644 --- a/cmake/cmake/modules/PHP/Set.cmake +++ b/cmake/cmake/modules/PHP/Set.cmake @@ -1,4 +1,6 @@ #[=============================================================================[ +# PHP/Set + Set a CACHE variable that depends on a set of conditions. At the time of writing, there are three main ways in CMake to create diff --git a/cmake/cmake/modules/PHP/StandardLibrary.cmake b/cmake/cmake/modules/PHP/StandardLibrary.cmake index b1b0febf3..54ac9c716 100644 --- a/cmake/cmake/modules/PHP/StandardLibrary.cmake +++ b/cmake/cmake/modules/PHP/StandardLibrary.cmake @@ -1,4 +1,6 @@ #[=============================================================================[ +# PHP/StandardLibrary + Determine the C standard library used for the build. ## Result variables diff --git a/cmake/cmake/modules/PHP/Stubs.cmake b/cmake/cmake/modules/PHP/Stubs.cmake index e96e8c577..6258068c8 100644 --- a/cmake/cmake/modules/PHP/Stubs.cmake +++ b/cmake/cmake/modules/PHP/Stubs.cmake @@ -1,4 +1,6 @@ #[=============================================================================[ +# PHP/Stubs + Generate *_arginfo.h headers from the *.stub.php sources The build/gen_stub.php script requires the PHP tokenizer extension. diff --git a/cmake/cmake/modules/PHP/SystemExtensions.cmake b/cmake/cmake/modules/PHP/SystemExtensions.cmake index dfaf6e45f..162ce6591 100644 --- a/cmake/cmake/modules/PHP/SystemExtensions.cmake +++ b/cmake/cmake/modules/PHP/SystemExtensions.cmake @@ -1,4 +1,6 @@ #[=============================================================================[ +# PHP/SystemExtensions + Enable extensions to C or POSIX on systems that by default disable them to conform to standards or namespace issues. diff --git a/cmake/cmake/modules/PHP/ThreadSafety.cmake b/cmake/cmake/modules/PHP/ThreadSafety.cmake index 439bd36d8..51b65c6c7 100644 --- a/cmake/cmake/modules/PHP/ThreadSafety.cmake +++ b/cmake/cmake/modules/PHP/ThreadSafety.cmake @@ -1,4 +1,6 @@ #[=============================================================================[ +# PHP/ThreadSafety + Check for thread safety, a.k.a. ZTS (Zend thread safety) build. ## Result variables diff --git a/cmake/cmake/modules/Packages/LibXml2.cmake b/cmake/cmake/modules/Packages/LibXml2.cmake index 3177e9188..1e7fa0c2b 100644 --- a/cmake/cmake/modules/Packages/LibXml2.cmake +++ b/cmake/cmake/modules/Packages/LibXml2.cmake @@ -1,4 +1,6 @@ #[=============================================================================[ +# Packages/LibXml2 + Wrapper for finding the `libxml2` library. Module first tries to find the `libxml2` library on the system. If not diff --git a/cmake/ext/bz2/CMakeLists.txt b/cmake/ext/bz2/CMakeLists.txt index 22d388439..b50ad90d1 100644 --- a/cmake/ext/bz2/CMakeLists.txt +++ b/cmake/ext/bz2/CMakeLists.txt @@ -35,7 +35,7 @@ option(EXT_BZ2 "Enable the bz2 extension" OFF) add_feature_info( "ext/bz2" EXT_BZ2 - "Support for reading and writing BZip2 (.bz2) compressed files" + "support for reading and writing BZip2 (.bz2) compressed files" ) cmake_dependent_option( diff --git a/cmake/ext/calendar/CMakeLists.txt b/cmake/ext/calendar/CMakeLists.txt index ee469a7ae..581abb749 100644 --- a/cmake/ext/calendar/CMakeLists.txt +++ b/cmake/ext/calendar/CMakeLists.txt @@ -33,7 +33,7 @@ option(EXT_CALENDAR "Enable the calendar extension" OFF) add_feature_info( "ext/calendar" EXT_CALENDAR - "Calendar conversion support" + "calendar conversion support" ) cmake_dependent_option( diff --git a/cmake/ext/ctype/CMakeLists.txt b/cmake/ext/ctype/CMakeLists.txt index 1f44ad28c..c648cd3ef 100644 --- a/cmake/ext/ctype/CMakeLists.txt +++ b/cmake/ext/ctype/CMakeLists.txt @@ -34,7 +34,7 @@ option(EXT_CTYPE "Enable the ctype extension" ON) add_feature_info( "ext/ctype" EXT_CTYPE - "Support for character type checking according to the locale" + "support for character type checking according to the locale" ) cmake_dependent_option( diff --git a/cmake/ext/curl/CMakeLists.txt b/cmake/ext/curl/CMakeLists.txt index 5112b34f1..1aa03f349 100644 --- a/cmake/ext/curl/CMakeLists.txt +++ b/cmake/ext/curl/CMakeLists.txt @@ -37,7 +37,7 @@ option(EXT_CURL "Enable the curl extension" OFF) add_feature_info( "ext/curl" EXT_CURL - "Support for using CURL - Client URL Library" + "support for using CURL - Client URL Library" ) cmake_dependent_option( diff --git a/cmake/ext/date/CMakeLists.txt b/cmake/ext/date/CMakeLists.txt index ca7ade21c..4901e46ec 100644 --- a/cmake/ext/date/CMakeLists.txt +++ b/cmake/ext/date/CMakeLists.txt @@ -19,7 +19,7 @@ include(FeatureSummary) add_feature_info( "ext/date" ON - "Date and time" + "date and time" ) # Check for headers needed by timelib. diff --git a/cmake/ext/dba/CMakeLists.txt b/cmake/ext/dba/CMakeLists.txt index 511289639..e6ac8bc89 100644 --- a/cmake/ext/dba/CMakeLists.txt +++ b/cmake/ext/dba/CMakeLists.txt @@ -121,7 +121,7 @@ option(EXT_DBA "Enable the dba extension" OFF) add_feature_info( "ext/dba" EXT_DBA - "Database (dbm-style) abstraction layer support" + "database (dbm-style) abstraction layer support" ) cmake_dependent_option( diff --git a/cmake/ext/dl_test/CMakeLists.txt b/cmake/ext/dl_test/CMakeLists.txt index c9d69debe..0a467dc65 100644 --- a/cmake/ext/dl_test/CMakeLists.txt +++ b/cmake/ext/dl_test/CMakeLists.txt @@ -28,7 +28,7 @@ option(EXT_DL_TEST "Enable the dl_test extension" OFF) add_feature_info( "ext/dl_test" EXT_DL_TEST - "Support for testing dl() function" + "support for testing dl() function" ) if(NOT EXT_DL_TEST) diff --git a/cmake/ext/dom/CMakeLists.txt b/cmake/ext/dom/CMakeLists.txt index c38a5a53f..0e9d29155 100644 --- a/cmake/ext/dom/CMakeLists.txt +++ b/cmake/ext/dom/CMakeLists.txt @@ -34,7 +34,7 @@ option(EXT_DOM "Enable the dom extension" ON) add_feature_info( "ext/dom" EXT_DOM - "Support for operations on XML and HTML through Document Object Model (DOM)" + "support for XML and HTML operations through Document Object Model (DOM)" ) cmake_dependent_option( diff --git a/cmake/ext/enchant/CMakeLists.txt b/cmake/ext/enchant/CMakeLists.txt index 09f020c7b..5f1205873 100644 --- a/cmake/ext/enchant/CMakeLists.txt +++ b/cmake/ext/enchant/CMakeLists.txt @@ -34,7 +34,7 @@ option(EXT_ENCHANT "Enable the enchant extension" OFF) add_feature_info( "ext/enchant" EXT_ENCHANT - "PHP binding for the Enchant spelling library" + "binding for the Enchant spelling library" ) cmake_dependent_option( diff --git a/cmake/ext/exif/CMakeLists.txt b/cmake/ext/exif/CMakeLists.txt index afe0c7fa5..dfcb25cde 100644 --- a/cmake/ext/exif/CMakeLists.txt +++ b/cmake/ext/exif/CMakeLists.txt @@ -33,7 +33,7 @@ option(EXT_EXIF "Enable the exif extension" OFF) add_feature_info( "ext/exif" EXT_EXIF - "Support for working with exchangeable image metadata" + "support for exchangeable image metadata" ) cmake_dependent_option( diff --git a/cmake/ext/fileinfo/CMakeLists.txt b/cmake/ext/fileinfo/CMakeLists.txt index b4503e0fc..c5de33e82 100644 --- a/cmake/ext/fileinfo/CMakeLists.txt +++ b/cmake/ext/fileinfo/CMakeLists.txt @@ -36,7 +36,7 @@ option(EXT_FILEINFO "Enable the fileinfo extension" ON) add_feature_info( "ext/fileinfo" EXT_FILEINFO - "Support for file content type and encoding" + "file content type and encoding support" ) cmake_dependent_option( diff --git a/cmake/ext/filter/CMakeLists.txt b/cmake/ext/filter/CMakeLists.txt index 37406e452..fc347f46b 100644 --- a/cmake/ext/filter/CMakeLists.txt +++ b/cmake/ext/filter/CMakeLists.txt @@ -33,7 +33,7 @@ option(EXT_FILTER "Enable the filter extension" ON) add_feature_info( "ext/filter" EXT_FILTER - "Data filtering support" + "data filtering support" ) cmake_dependent_option( diff --git a/cmake/ext/gd/CMakeLists.txt b/cmake/ext/gd/CMakeLists.txt index e9f533d9b..418f38a3c 100644 --- a/cmake/ext/gd/CMakeLists.txt +++ b/cmake/ext/gd/CMakeLists.txt @@ -88,7 +88,7 @@ option(EXT_GD "Enable the gd extension" OFF) add_feature_info( "ext/gd" EXT_GD - "Image processing and graphics draw (GD) support" + "image processing and graphics draw (GD) support" ) cmake_dependent_option( @@ -110,7 +110,7 @@ cmake_dependent_option( add_feature_info( "ext/gd with external GD library" EXT_GD_EXTERNAL - "Support for external GD library instead of bundled one" + "external GD library instead of the bundled one" ) cmake_dependent_option( @@ -124,7 +124,7 @@ cmake_dependent_option( add_feature_info( "ext/gd AVIF" EXT_GD_AVIF - "AVIF support for gd extension" + "AVIF support" ) cmake_dependent_option( @@ -138,7 +138,7 @@ cmake_dependent_option( add_feature_info( "ext/gd WebP" EXT_GD_WEBP - "WebP support for gd extension" + "WebP support" ) cmake_dependent_option( @@ -152,7 +152,7 @@ cmake_dependent_option( add_feature_info( "ext/gd JPEG" EXT_GD_JPEG - "JPEG support for gd extension" + "JPEG support" ) cmake_dependent_option( @@ -166,7 +166,7 @@ cmake_dependent_option( add_feature_info( "ext/gd XPM" EXT_GD_XPM - "XPM support for gd extension" + "XPM support" ) cmake_dependent_option( @@ -180,7 +180,7 @@ cmake_dependent_option( add_feature_info( "ext/gd FreeType" EXT_GD_FREETYPE - "FreeType 2 support for gd extension" + "FreeType 2 support" ) cmake_dependent_option( @@ -194,7 +194,7 @@ cmake_dependent_option( add_feature_info( "ext/gd JIS" EXT_GD_JIS - "JIS-mapped Japanese font support for gd extension (only for bundled libgd)" + "JIS-mapped Japanese font support" ) if(NOT EXT_GD) @@ -301,7 +301,6 @@ if(NOT EXT_GD_EXTERNAL) php_search_libraries( fabsf - HAVE_FABSF HEADERS math.h LIBRARIES m TARGET php_gd PRIVATE diff --git a/cmake/ext/gettext/CMakeLists.txt b/cmake/ext/gettext/CMakeLists.txt index ce4967582..73b1ee94b 100644 --- a/cmake/ext/gettext/CMakeLists.txt +++ b/cmake/ext/gettext/CMakeLists.txt @@ -35,7 +35,7 @@ option(EXT_GETTEXT "Enable the gettext extension" OFF) add_feature_info( "ext/gettext" EXT_GETTEXT - "Support for GNU gettext using NLS (Native Language Support) API" + "support for GNU gettext using NLS (Native Language Support) API" ) cmake_dependent_option( diff --git a/cmake/ext/hash/CMakeLists.txt b/cmake/ext/hash/CMakeLists.txt index 363cfe3e5..15d9b61df 100644 --- a/cmake/ext/hash/CMakeLists.txt +++ b/cmake/ext/hash/CMakeLists.txt @@ -35,7 +35,7 @@ option(EXT_HASH_MHASH "Enable the mhash support (deprecated as of PHP 8.1)" OFF) add_feature_info( "ext/hash with mhash" EXT_HASH_MHASH - "The mhash emulation in the hash extension" + "mhash emulation" ) if(EXT_HASH_MHASH) diff --git a/cmake/ext/iconv/CMakeLists.txt b/cmake/ext/iconv/CMakeLists.txt index 10fcc2b40..9db56cb17 100644 --- a/cmake/ext/iconv/CMakeLists.txt +++ b/cmake/ext/iconv/CMakeLists.txt @@ -38,7 +38,7 @@ option(EXT_ICONV "Enable the iconv extension" ON) add_feature_info( "ext/iconv" EXT_ICONV - "Support for interface to iconv character set conversion facility" + "interface to iconv character set conversion facility" ) cmake_dependent_option( diff --git a/cmake/ext/imap/CMakeLists.txt b/cmake/ext/imap/CMakeLists.txt index 7c324cd2d..3ba0816e5 100644 --- a/cmake/ext/imap/CMakeLists.txt +++ b/cmake/ext/imap/CMakeLists.txt @@ -48,7 +48,7 @@ option(EXT_IMAP "Enable the imap extension" OFF) add_feature_info( "ext/imap" EXT_IMAP - "Support for operating with the IMAP protocol" + "support for operating with the IMAP protocol" ) cmake_dependent_option( diff --git a/cmake/ext/intl/CMakeLists.txt b/cmake/ext/intl/CMakeLists.txt index da8f3660e..d98cfcb3b 100644 --- a/cmake/ext/intl/CMakeLists.txt +++ b/cmake/ext/intl/CMakeLists.txt @@ -35,7 +35,7 @@ option(EXT_INTL "Enable the intl extension" OFF) add_feature_info( "ext/intl" EXT_INTL - "Support for internationalization, a wrapper for ICU library" + "support for internationalization, a wrapper for ICU library" ) cmake_dependent_option( diff --git a/cmake/ext/ldap/CMakeLists.txt b/cmake/ext/ldap/CMakeLists.txt index 64af038b7..11e66f90c 100644 --- a/cmake/ext/ldap/CMakeLists.txt +++ b/cmake/ext/ldap/CMakeLists.txt @@ -44,7 +44,7 @@ option(EXT_LDAP "Enable the ldap extension" OFF) add_feature_info( "ext/ldap" EXT_LDAP - "Support for LDAP (Lightweight Directory Access Protocol)" + "LDAP (Lightweight Directory Access Protocol) support" ) cmake_dependent_option( diff --git a/cmake/ext/libxml/CMakeLists.txt b/cmake/ext/libxml/CMakeLists.txt index 405c675e1..bf715c4b7 100644 --- a/cmake/ext/libxml/CMakeLists.txt +++ b/cmake/ext/libxml/CMakeLists.txt @@ -3,7 +3,7 @@ Configure the `libxml` extension. -This extension provides support for XML parser and toolkit libxml. +This extension provides XML parser and toolkit support using libxml2 library. ## EXT_LIBXML @@ -31,7 +31,7 @@ option( add_feature_info( "ext/libxml" EXT_LIBXML - "Support for XML parser and toolkit libxml" + "XML parser and toolkit support using libxml2 library" ) if(NOT EXT_LIBXML) diff --git a/cmake/ext/mbstring/CMakeLists.txt b/cmake/ext/mbstring/CMakeLists.txt index e481009e2..78eab683e 100644 --- a/cmake/ext/mbstring/CMakeLists.txt +++ b/cmake/ext/mbstring/CMakeLists.txt @@ -42,7 +42,7 @@ option(EXT_MBSTRING "Enable the mbstring extension" OFF) add_feature_info( "ext/mbstring" EXT_MBSTRING - "Multibyte string support" + "multibyte string support" ) cmake_dependent_option( @@ -64,7 +64,7 @@ cmake_dependent_option( add_feature_info( "ext/mbstring with multibyte regex" EXT_MBSTRING_MBREGEX - "Multibyte regex support using Oniguruma library" + "multibyte regex support using Oniguruma library" ) if(NOT EXT_MBSTRING) diff --git a/cmake/ext/mysqlnd/CMakeLists.txt b/cmake/ext/mysqlnd/CMakeLists.txt index 6e004f829..4dc013524 100644 --- a/cmake/ext/mysqlnd/CMakeLists.txt +++ b/cmake/ext/mysqlnd/CMakeLists.txt @@ -3,8 +3,8 @@ Configure the `mysqlnd` extension. -This extension contains MySQL Native Driver for supporting MySQL-compatible -database in PHP extensions. +This extension contains MySQL Native Driver for using MySQL-compatible databases +in PHP extensions. ## EXT_MYSQLND @@ -58,7 +58,7 @@ option(EXT_MYSQLND "Enable the mysqlnd extension" OFF) add_feature_info( "ext/mysqlnd" EXT_MYSQLND - "MySQL Native Driver for supporting MySQL-compatible database in extensions" + "MySQL Native Driver for using MySQL-compatible databases" ) cmake_dependent_option( @@ -85,8 +85,8 @@ add_feature_info( cmake_dependent_option( EXT_MYSQLND_SSL - "Explicitly enable extended SSL support in the mysqlnd extension through a\ - system library OpenSSL (*nix) or Crypt32 (Windows)." + "Explicitly enable extended SSL support in the mysqlnd extension through\ + OpenSSL system library (*nix) or Crypt32 (Windows)." OFF [[EXT_MYSQLND AND NOT EXT_OPENSSL AND NOT CMAKE_SYSTEM_NAME STREQUAL "Windows"]] OFF diff --git a/cmake/ext/opcache/CMakeLists.txt b/cmake/ext/opcache/CMakeLists.txt index d743d4e83..b6302ec12 100644 --- a/cmake/ext/opcache/CMakeLists.txt +++ b/cmake/ext/opcache/CMakeLists.txt @@ -197,7 +197,6 @@ if(EXT_OPCACHE_JIT) # Link math library as needed. php_search_libraries( floor - _HAVE_FLOOR HEADERS math.h LIBRARIES m TARGET php_opcache_jit_minilua PRIVATE diff --git a/cmake/ext/opcache/cmake/CheckSHM.cmake b/cmake/ext/opcache/cmake/CheckSHM.cmake index 7c149d99f..b508d9caf 100644 --- a/cmake/ext/opcache/cmake/CheckSHM.cmake +++ b/cmake/ext/opcache/cmake/CheckSHM.cmake @@ -198,14 +198,14 @@ message(CHECK_START "Checking for mmap() using shm_open() shared memory support" # Haiku. php_search_libraries( shm_open - HAVE_SHM_OPEN HEADERS sys/mman.h LIBRARIES rt # Solaris <= 10, older Linux + VARIABLE _HAVE_SHM_OPEN LIBRARY_VARIABLE libraryForShmOpen ) -if(HAVE_SHM_OPEN) +if(_HAVE_SHM_OPEN) cmake_push_check_state(RESET) if(libraryForShmOpen) set(CMAKE_REQUIRED_LIBRARIES ${libraryForShmOpen}) diff --git a/cmake/ext/openssl/CMakeLists.txt b/cmake/ext/openssl/CMakeLists.txt index 21ae89282..ab7588807 100644 --- a/cmake/ext/openssl/CMakeLists.txt +++ b/cmake/ext/openssl/CMakeLists.txt @@ -3,7 +3,8 @@ Configure the `openssl` extension. -This extension enables using OpenSSL library for encryption and decryption. +This extension enables encryption and decryption support using the OpenSSL +library. ## EXT_OPENSSL @@ -60,7 +61,7 @@ option(EXT_OPENSSL "Enable the openssl extension" OFF) add_feature_info( "ext/openssl" EXT_OPENSSL - "OpenSSL library support for encryption and decryption" + "encryption and decryption support with OpenSSL library" ) cmake_dependent_option( @@ -73,7 +74,8 @@ cmake_dependent_option( cmake_dependent_option( EXT_OPENSSL_KERBEROS - "Include Kerberos support for OpenSSL" + "Include Kerberos support for OpenSSL. Deprecated. Kerberos support has been\ + removed as of OpenSSL 1.1.0." OFF "EXT_OPENSSL" OFF @@ -83,8 +85,7 @@ mark_as_advanced(EXT_OPENSSL_KERBEROS) add_feature_info( "ext/openssl Kerberos" EXT_OPENSSL_KERBEROS - "Using OpenSSL library built with Kerberos enabled. Deprecated. Kerberos\ - support has been removed as of OpenSSL 1.1.0." + "OpenSSL library built with Kerberos enabled" ) cmake_dependent_option( @@ -99,7 +100,7 @@ mark_as_advanced(EXT_OPENSSL_SYSTEM_CIPHERS) add_feature_info( "ext/openssl system ciphers" EXT_OPENSSL_SYSTEM_CIPHERS - "Using system default cipher list instead of hardcoded value for OpenSSL" + "using system default cipher list instead of hardcoded value for OpenSSL" ) set(HAVE_OPENSSL_EXT "/* #undef HAVE_OPENSSL_EXT */") diff --git a/cmake/ext/pcntl/CMakeLists.txt b/cmake/ext/pcntl/CMakeLists.txt index e6b8d7ba7..d7425f25d 100644 --- a/cmake/ext/pcntl/CMakeLists.txt +++ b/cmake/ext/pcntl/CMakeLists.txt @@ -42,12 +42,12 @@ include(CMakeDependentOption) include(CMakePushCheckState) include(FeatureSummary) -option(EXT_PCNTL "Enable the pcntl extension (CLI/CGI only)" OFF) +option(EXT_PCNTL "Enable the pcntl extension (only for CLI-based SAPIs)" OFF) add_feature_info( "ext/pcntl" EXT_PCNTL - "Process control support (CLI/CGI only)" + "process control support" ) cmake_dependent_option( diff --git a/cmake/ext/pcre/CMakeLists.txt b/cmake/ext/pcre/CMakeLists.txt index b729ef25d..2ecfc0c0b 100644 --- a/cmake/ext/pcre/CMakeLists.txt +++ b/cmake/ext/pcre/CMakeLists.txt @@ -38,7 +38,7 @@ include(PHP/CheckCompilerFlag) add_feature_info( "ext/pcre" ON - "(Perl-compatible) regular expressions" + "Perl-compatible regular expressions" ) option( @@ -51,7 +51,7 @@ option( add_feature_info( "ext/pcre external library" EXT_PCRE_EXTERNAL - "Using system PCRE library instead of the bundled library" + "using system PCRE library instead of the bundled library" ) option( diff --git a/cmake/ext/pdo/CMakeLists.txt b/cmake/ext/pdo/CMakeLists.txt index edb0288f4..9befcb5ea 100644 --- a/cmake/ext/pdo/CMakeLists.txt +++ b/cmake/ext/pdo/CMakeLists.txt @@ -33,7 +33,7 @@ option(EXT_PDO "Enable the pdo extension" ON) add_feature_info( "ext/pdo" EXT_PDO - "PHP Data Objects (PDO) support" + "PHP Data Objects (PDO)" ) cmake_dependent_option( diff --git a/cmake/ext/pdo_firebird/CMakeLists.txt b/cmake/ext/pdo_firebird/CMakeLists.txt index acfc59aee..1e7852ed1 100644 --- a/cmake/ext/pdo_firebird/CMakeLists.txt +++ b/cmake/ext/pdo_firebird/CMakeLists.txt @@ -34,7 +34,7 @@ option(EXT_PDO_FIREBIRD "Enable the pdo_firebird extension" OFF) add_feature_info( "ext/pdo_firebird" EXT_PDO_FIREBIRD - "Firebird database support in PDO (PHP Data Objects) interface" + "Firebird database support in PDO (PHP Data Objects)" ) cmake_dependent_option( diff --git a/cmake/ext/pdo_mysql/CMakeLists.txt b/cmake/ext/pdo_mysql/CMakeLists.txt index ce644092a..d5f0aa6a8 100644 --- a/cmake/ext/pdo_mysql/CMakeLists.txt +++ b/cmake/ext/pdo_mysql/CMakeLists.txt @@ -49,7 +49,7 @@ option(EXT_PDO_MYSQL "Enable the pdo_mysql extension" OFF) add_feature_info( "ext/pdo_mysql" EXT_PDO_MYSQL - "MySQL-compatible database support in PDO (PHP Data Objects) interface" + "MySQL-compatible database support in PDO (PHP Data Objects)" ) cmake_dependent_option( diff --git a/cmake/ext/pdo_oci/CMakeLists.txt b/cmake/ext/pdo_oci/CMakeLists.txt index 5f2456415..7a43fe3f4 100644 --- a/cmake/ext/pdo_oci/CMakeLists.txt +++ b/cmake/ext/pdo_oci/CMakeLists.txt @@ -33,7 +33,7 @@ option(EXT_PDO_OCI "Enable the pdo_oci extension" OFF) add_feature_info( "ext/pdo_oci" EXT_PDO_OCI - "Oracle database support in PDO (PHP Data Objects) interface" + "Oracle database support in PDO (PHP Data Objects)" ) cmake_dependent_option( diff --git a/cmake/ext/pdo_sqlite/CMakeLists.txt b/cmake/ext/pdo_sqlite/CMakeLists.txt index 8d49c1347..06489c043 100644 --- a/cmake/ext/pdo_sqlite/CMakeLists.txt +++ b/cmake/ext/pdo_sqlite/CMakeLists.txt @@ -34,7 +34,7 @@ option(EXT_PDO_SQLITE "Enable the pdo_sqlite extension" ON) add_feature_info( "ext/pdo_sqlite" EXT_PDO_SQLITE - "SQLite database support in PDO (PHP Data Objects) interface" + "SQLite database support in PDO (PHP Data Objects)" ) cmake_dependent_option( diff --git a/cmake/ext/posix/CMakeLists.txt b/cmake/ext/posix/CMakeLists.txt index 02d24e552..b965b4b3c 100644 --- a/cmake/ext/posix/CMakeLists.txt +++ b/cmake/ext/posix/CMakeLists.txt @@ -43,7 +43,7 @@ option(EXT_POSIX "Enable the posix extension (POSIX-like functions)" ON) add_feature_info( "ext/posix" EXT_POSIX - "Interface for using IEEE 1003.1 (POSIX.1) functions" + "interface for using IEEE 1003.1 (POSIX.1) functions" ) cmake_dependent_option( diff --git a/cmake/ext/pspell/CMakeLists.txt b/cmake/ext/pspell/CMakeLists.txt index 0ba82083b..3b4bc30af 100644 --- a/cmake/ext/pspell/CMakeLists.txt +++ b/cmake/ext/pspell/CMakeLists.txt @@ -34,7 +34,7 @@ option(EXT_PSPELL "Enable the pspell extension" OFF) add_feature_info( "ext/pspell" EXT_PSPELL - "Spellchecking support" + "spellchecking support" ) cmake_dependent_option( diff --git a/cmake/ext/random/CMakeLists.txt b/cmake/ext/random/CMakeLists.txt index fda54de09..60fb64bb9 100644 --- a/cmake/ext/random/CMakeLists.txt +++ b/cmake/ext/random/CMakeLists.txt @@ -19,7 +19,7 @@ include(FeatureSummary) add_feature_info( "ext/random" ON - "Random number generators and functions related to randomness" + "random number generators and functions related to randomness" ) add_library(php_random STATIC) diff --git a/cmake/ext/readline/CMakeLists.txt b/cmake/ext/readline/CMakeLists.txt index e02abf988..19d26d416 100644 --- a/cmake/ext/readline/CMakeLists.txt +++ b/cmake/ext/readline/CMakeLists.txt @@ -44,12 +44,12 @@ include(CMakePushCheckState) include(FeatureSummary) include(PHP/CheckCompilerFlag) -option(EXT_READLINE "Enable the readline extension" OFF) +option(EXT_READLINE "Enable the readline extension (only for CLI-based SAPIs)" OFF) add_feature_info( "ext/readline" EXT_READLINE - "Interface for using Editline library. CLI/CGI only" + "interface for using Editline library" ) cmake_dependent_option( diff --git a/cmake/ext/reflection/CMakeLists.txt b/cmake/ext/reflection/CMakeLists.txt index efec54cbb..cc57c8a8b 100644 --- a/cmake/ext/reflection/CMakeLists.txt +++ b/cmake/ext/reflection/CMakeLists.txt @@ -17,7 +17,7 @@ include(FeatureSummary) add_feature_info( "ext/reflection" ON - "Reflection API to introspect PHP code" + "reflection API to introspect PHP code" ) add_library(php_reflection STATIC) diff --git a/cmake/ext/session/CMakeLists.txt b/cmake/ext/session/CMakeLists.txt index 1904160a2..1c96ba483 100644 --- a/cmake/ext/session/CMakeLists.txt +++ b/cmake/ext/session/CMakeLists.txt @@ -41,7 +41,7 @@ option(EXT_SESSION "Enable the session extension" ON) add_feature_info( "ext/session" EXT_SESSION - "Sessions support to preserve data across subsequent accesses" + "sessions support to preserve data across subsequent accesses" ) cmake_dependent_option( diff --git a/cmake/ext/shmop/CMakeLists.txt b/cmake/ext/shmop/CMakeLists.txt index 4faf0774e..fc72ae1e3 100644 --- a/cmake/ext/shmop/CMakeLists.txt +++ b/cmake/ext/shmop/CMakeLists.txt @@ -33,7 +33,7 @@ option(EXT_SHMOP "Enable the shmop extension" OFF) add_feature_info( "ext/shmop" EXT_SHMOP - "Support for shared memory segments operations" + "support for shared memory segments operations" ) cmake_dependent_option( diff --git a/cmake/ext/simplexml/CMakeLists.txt b/cmake/ext/simplexml/CMakeLists.txt index d78ea0bb0..116f51d55 100644 --- a/cmake/ext/simplexml/CMakeLists.txt +++ b/cmake/ext/simplexml/CMakeLists.txt @@ -33,7 +33,7 @@ option(EXT_SIMPLEXML "Enable the simplexml extension" ON) add_feature_info( "ext/simplexml" EXT_SIMPLEXML - "Toolset for converting XML to a processable object" + "toolset for converting XML to a processable object" ) cmake_dependent_option( diff --git a/cmake/ext/skeleton/CMakeLists.txt.in b/cmake/ext/skeleton/CMakeLists.txt.in index 1b0644c52..80a48dc04 100644 --- a/cmake/ext/skeleton/CMakeLists.txt.in +++ b/cmake/ext/skeleton/CMakeLists.txt.in @@ -50,7 +50,7 @@ option(EXT_%EXTNAMECAPS% "Enable the %EXTNAME% extension" OFF) add_feature_info( "ext/%EXTNAME%" EXT_%EXTNAMECAPS% - "Describe the extension features" + "short description of extension features" ) # Dependent boolean option that builds extension as a shared library. CMake's diff --git a/cmake/ext/soap/CMakeLists.txt b/cmake/ext/soap/CMakeLists.txt index 5eea79cf5..5eae153ca 100644 --- a/cmake/ext/soap/CMakeLists.txt +++ b/cmake/ext/soap/CMakeLists.txt @@ -33,7 +33,7 @@ option(EXT_SOAP "Enable the soap extension" OFF) add_feature_info( "ext/soap" EXT_SOAP - "Support for writing SOAP servers and clients" + "support for writing SOAP servers and clients" ) cmake_dependent_option( diff --git a/cmake/ext/sockets/CMakeLists.txt b/cmake/ext/sockets/CMakeLists.txt index dd34383ca..c6c2835e4 100644 --- a/cmake/ext/sockets/CMakeLists.txt +++ b/cmake/ext/sockets/CMakeLists.txt @@ -38,7 +38,7 @@ option(EXT_SOCKETS "Enable the sockets extension" OFF) add_feature_info( "ext/sockets" EXT_SOCKETS - "Support for a low-level socket communication interface" + "support for a low-level socket communication interface" ) cmake_dependent_option( diff --git a/cmake/ext/sodium/CMakeLists.txt b/cmake/ext/sodium/CMakeLists.txt index 17752ada2..73d6e2f51 100644 --- a/cmake/ext/sodium/CMakeLists.txt +++ b/cmake/ext/sodium/CMakeLists.txt @@ -35,7 +35,7 @@ option(EXT_SODIUM "Enable the sodium extension" OFF) add_feature_info( "ext/sodium" EXT_SODIUM - "Support for encryption, decryption, signatures and password hashing" + "support for encryption, decryption, signatures and password hashing" ) cmake_dependent_option( diff --git a/cmake/ext/spl/CMakeLists.txt b/cmake/ext/spl/CMakeLists.txt index acff84149..369dae7cb 100644 --- a/cmake/ext/spl/CMakeLists.txt +++ b/cmake/ext/spl/CMakeLists.txt @@ -16,7 +16,7 @@ include(FeatureSummary) add_feature_info( "ext/spl" ON - "Standard PHP library" + "Standard PHP library (SPL)" ) add_library(php_spl STATIC) diff --git a/cmake/ext/standard/CMakeLists.txt b/cmake/ext/standard/CMakeLists.txt index 5b2b76ac2..b806d053d 100644 --- a/cmake/ext/standard/CMakeLists.txt +++ b/cmake/ext/standard/CMakeLists.txt @@ -45,7 +45,7 @@ option(EXT_STANDARD_ARGON2 "Include the Argon2 support in password_*" OFF) add_feature_info( "ext/standard Argon2" EXT_STANDARD_ARGON2 - "Support for Argon2 hashing in password_*() PHP functions" + "Argon2 hashing support in password_*() PHP functions" ) option(EXT_STANDARD_EXTERNAL_LIBCRYPT "Use external libcrypt or libxcrypt" OFF) @@ -53,7 +53,7 @@ option(EXT_STANDARD_EXTERNAL_LIBCRYPT "Use external libcrypt or libxcrypt" OFF) add_feature_info( "External librcypt" EXT_STANDARD_EXTERNAL_LIBCRYPT - "External libcrypt or libxcrypt library" + "external libcrypt or libxcrypt library instead of the crypt bundled in PHP" ) ################################################################################ @@ -352,11 +352,11 @@ endif() # The getifaddrs() is available in C library some systems (Solaris 11.4...) php_search_libraries( getifaddrs - _HAVE_GETIFADDRS HEADERS ifaddrs.h LIBRARIES socket # Solaris 11..11.3, illumos network # Haiku + VARIABLE _HAVE_GETIFADDRS LIBRARY_VARIABLE libraryForGetifaddrs TARGET php_standard PRIVATE ) @@ -403,23 +403,23 @@ endif() # HAVE_FULL_DNS_FUNCS. php_search_libraries( dn_expand - HAVE_DN_EXPAND HEADERS netinet/in.h # BSD-based systems (FreeBSD<=13) need it for resolv.h to work. resolv.h LIBRARIES resolv # Solaris/illumos + VARIABLE HAVE_DN_EXPAND TARGET php_standard PRIVATE ) php_search_libraries( dn_skipname - HAVE_DN_SKIPNAME HEADERS netinet/in.h # BSD-based systems (FreeBSD<=13) need it for resolv.h to work. resolv.h LIBRARIES resolv # Solaris/illumos + VARIABLE HAVE_DN_SKIPNAME TARGET php_standard PRIVATE ) @@ -428,7 +428,6 @@ php_search_libraries( # library needs to be linked on macOS. php_search_libraries( res_9_dn_skipname - _HAVE_RES_9_DN_SKIPNAME HEADERS resolv.h LIBRARIES @@ -438,47 +437,47 @@ php_search_libraries( php_search_libraries( dns_search - HAVE_DNS_SEARCH HEADERS netinet/in.h # BSD-based systems (FreeBSD<=13) need it for resolv.h to work. resolv.h dns.h # macOS LIBRARIES resolv # Solaris/illumos, macOS + VARIABLE HAVE_DNS_SEARCH TARGET php_standard PRIVATE ) php_search_libraries( res_ndestroy - HAVE_RES_NDESTROY HEADERS netinet/in.h # BSD-based systems (FreeBSD<=13) need it for resolv.h to work. resolv.h LIBRARIES resolv # Solaris/illumos + VARIABLE HAVE_RES_NDESTROY TARGET php_standard PRIVATE ) php_search_libraries( res_nsearch - HAVE_RES_NSEARCH HEADERS netinet/in.h # BSD-based systems (FreeBSD<=13) need it for resolv.h to work. resolv.h LIBRARIES resolv # Solaris/illumos + VARIABLE HAVE_RES_NSEARCH TARGET php_standard PRIVATE ) # res_search() is deprecated and should be replaced with res_nsearch(). php_search_libraries( res_search - HAVE_RES_SEARCH HEADERS netinet/in.h # BSD-based systems (FreeBSD<=13) need it for resolv.h to work. resolv.h LIBRARIES resolv # Solaris/illumos + VARIABLE HAVE_RES_SEARCH TARGET php_standard PRIVATE ) diff --git a/cmake/ext/tokenizer/CMakeLists.txt b/cmake/ext/tokenizer/CMakeLists.txt index 0f1243b92..4787809fc 100644 --- a/cmake/ext/tokenizer/CMakeLists.txt +++ b/cmake/ext/tokenizer/CMakeLists.txt @@ -3,7 +3,7 @@ Configure the `tokenizer` extension. -This extension provides interface to the PHP tokenizer embedded in the Zend +This extension provides an interface to the PHP tokenizer embedded in the Zend Engine. ## EXT_TOKENIZER @@ -35,7 +35,7 @@ option(EXT_TOKENIZER "Enable the tokenizer extension" ON) add_feature_info( "ext/tokenizer" EXT_TOKENIZER - "Interface to the PHP tokenizer embedded in the Zend Engine" + "interface to the PHP tokenizer embedded in the Zend Engine" ) cmake_dependent_option( diff --git a/cmake/ext/xml/CMakeLists.txt b/cmake/ext/xml/CMakeLists.txt index 73aeb1e4d..ec55b12ca 100644 --- a/cmake/ext/xml/CMakeLists.txt +++ b/cmake/ext/xml/CMakeLists.txt @@ -40,7 +40,7 @@ option(EXT_XML "Enable the xml extension" ON) add_feature_info( "ext/xml" EXT_XML - "Support for parsing XML" + "support for parsing XML" ) cmake_dependent_option( diff --git a/cmake/ext/xmlreader/CMakeLists.txt b/cmake/ext/xmlreader/CMakeLists.txt index 67f9c202f..f9ac15b14 100644 --- a/cmake/ext/xmlreader/CMakeLists.txt +++ b/cmake/ext/xmlreader/CMakeLists.txt @@ -33,7 +33,7 @@ option(EXT_XMLREADER "Enable the xmlreader extension" ON) add_feature_info( "ext/xmlreader" EXT_XMLREADER - "Support for XML pull parser" + "support for XML pull parser" ) cmake_dependent_option( diff --git a/cmake/ext/xmlwriter/CMakeLists.txt b/cmake/ext/xmlwriter/CMakeLists.txt index 1429a4f28..750cba49d 100644 --- a/cmake/ext/xmlwriter/CMakeLists.txt +++ b/cmake/ext/xmlwriter/CMakeLists.txt @@ -33,7 +33,7 @@ option(EXT_XMLWRITER "Enable the xmlwriter extension" ON) add_feature_info( "ext/xmlwriter" EXT_XMLWRITER - "Support for libxml xmlWriter API" + "support for libxml xmlWriter API" ) cmake_dependent_option( diff --git a/cmake/ext/xsl/CMakeLists.txt b/cmake/ext/xsl/CMakeLists.txt index fbcc26b99..954f6eccb 100644 --- a/cmake/ext/xsl/CMakeLists.txt +++ b/cmake/ext/xsl/CMakeLists.txt @@ -117,7 +117,7 @@ endif() add_feature_info( "ext/xsl with EXSLT" HAVE_XSL_EXSLT - "Adds support for XSLT extensions (EXSLT)" + "support for XSLT extensions (EXSLT)" ) set(HAVE_XSL 1) diff --git a/cmake/ext/zend_test/CMakeLists.txt b/cmake/ext/zend_test/CMakeLists.txt index 542ef9e22..6484750bf 100644 --- a/cmake/ext/zend_test/CMakeLists.txt +++ b/cmake/ext/zend_test/CMakeLists.txt @@ -33,7 +33,7 @@ option(EXT_ZEND_TEST "Enable the zend_test extension" OFF) add_feature_info( "ext/zend_test" EXT_ZEND_TEST - "Additional support for testing PHP" + "additional support when testing PHP build" ) cmake_dependent_option( diff --git a/cmake/ext/zip/CMakeLists.txt b/cmake/ext/zip/CMakeLists.txt index cab6988ad..9d41d74ea 100644 --- a/cmake/ext/zip/CMakeLists.txt +++ b/cmake/ext/zip/CMakeLists.txt @@ -34,7 +34,7 @@ option(EXT_ZIP "Enable the zip extension" OFF) add_feature_info( "ext/zip" EXT_ZIP - "Support for reading and writing ZIP compressed archives" + "support for reading and writing ZIP compressed archives" ) cmake_dependent_option( diff --git a/cmake/ext/zlib/CMakeLists.txt b/cmake/ext/zlib/CMakeLists.txt index 7f03a9a1b..4e55b8462 100644 --- a/cmake/ext/zlib/CMakeLists.txt +++ b/cmake/ext/zlib/CMakeLists.txt @@ -34,7 +34,7 @@ option(EXT_ZLIB "Enable the zlib extension" OFF) add_feature_info( "ext/zlib" EXT_ZLIB - "Support for reading and writing gzip (.gz) compressed files" + "support for reading and writing gzip (.gz) compressed files" ) cmake_dependent_option( diff --git a/cmake/sapi/apache2handler/CMakeLists.txt b/cmake/sapi/apache2handler/CMakeLists.txt index 58899ba46..dd8c6b203 100644 --- a/cmake/sapi/apache2handler/CMakeLists.txt +++ b/cmake/sapi/apache2handler/CMakeLists.txt @@ -10,14 +10,22 @@ Configure the `apache2handler` PHP SAPI. Enable the shared Apache 2 handler SAPI module. -Loadable via Apache's Dynamic Shared Object (DSO) support; If Apache will use -PHP with one of the threaded Multi-Processing Modules (MPMs), PHP must be -configured and built with `PHP_THREAD_SAFETY` set to `ON`. Thread safety will +Loadable via Apache's Dynamic Shared Object (DSO) support. If Apache will use +PHP together with one of the threaded Multi-Processing Modules (MPMs), PHP must +be configured and built with `PHP_THREAD_SAFETY` set to `ON`. Thread safety will be set automatically during the configuration step, if threaded Apache can be discovered on the system. -With `Apache_ROOT` and `Apache_APXS_EXECUTABLE` variables, path where to look -for the Apache installation on the system can be customized. +Path where to look for the Apache installation on the system can be customized +with the `Apache_ROOT` and `Apache_APXS_EXECUTABLE` variables. + +For example: + +```cmake +cmake -B php-build -DAPACHE2HANDLER=ON -DAPACHE_ROOT=/opt/apache2 +# or +cmake -B php-build -DAPACHE2HANDLER=ON -DApache_EXECUTABLE=/opt/apache2/bin/apxs +``` #]=============================================================================] include(FeatureSummary) @@ -31,7 +39,7 @@ option( add_feature_info( "sapi/apache2handler" SAPI_APACHE2HANDLER - "Apache 2 handler SAPI module" + "module for Apache HTTP server" ) if(NOT SAPI_APACHE2HANDLER) diff --git a/cmake/sapi/cgi/CMakeLists.txt b/cmake/sapi/cgi/CMakeLists.txt index 4144d58ff..15c7093c4 100644 --- a/cmake/sapi/cgi/CMakeLists.txt +++ b/cmake/sapi/cgi/CMakeLists.txt @@ -8,18 +8,18 @@ Configure the `cgi` PHP SAPI. * Default: `ON` * Values: `ON|OFF` -Enable the SAPI. +Enable the CGI (Common Gateway Interface) SAPI. #]=============================================================================] include(CheckStructHasMember) include(FeatureSummary) -option(SAPI_CGI "Enable the CGI SAPI executable" ON) +option(SAPI_CGI "Enable the CGI (Common Gateway Interface) SAPI" ON) add_feature_info( "sapi/cgi" SAPI_CGI - "CGI SAPI executable" + "Common Gateway Interface (CGI) SAPI executable" ) if(NOT SAPI_CGI) diff --git a/cmake/sapi/cli/CMakeLists.txt b/cmake/sapi/cli/CMakeLists.txt index 48bad1751..b402fb274 100644 --- a/cmake/sapi/cli/CMakeLists.txt +++ b/cmake/sapi/cli/CMakeLists.txt @@ -32,7 +32,7 @@ option(SAPI_CLI "Enable the CLI SAPI module" ON) add_feature_info( "sapi/cli" SAPI_CLI - "Command-line interface SAPI executable" + "Command-Line Interpreter/Interface SAPI executable" ) cmake_dependent_option( diff --git a/cmake/sapi/embed/CMakeLists.txt b/cmake/sapi/embed/CMakeLists.txt index 839071c46..88e983a6f 100644 --- a/cmake/sapi/embed/CMakeLists.txt +++ b/cmake/sapi/embed/CMakeLists.txt @@ -8,7 +8,7 @@ Configure the `embed` PHP SAPI. * Default: `OFF` * Values: `ON|OFF` -Enable the Embed SAPI module. +Enable the embedded PHP SAPI module. The embed library is then located in the `sapi/embed` directory as a shared library `libphp.so`, or a static library `libphp.a`, which can be further used @@ -23,7 +23,7 @@ option(SAPI_EMBED "Enable the Embed SAPI module" OFF) add_feature_info( "sapi/embed" SAPI_EMBED - "Embed SAPI module" + "SAPI module for embedding PHP into application using C bindings" ) if(NOT SAPI_EMBED) diff --git a/cmake/sapi/fpm/CMakeLists.txt b/cmake/sapi/fpm/CMakeLists.txt index 2cd2c712d..1d99757b6 100644 --- a/cmake/sapi/fpm/CMakeLists.txt +++ b/cmake/sapi/fpm/CMakeLists.txt @@ -150,7 +150,7 @@ php_set( add_feature_info( "sapi/fpm AppArmor" SAPI_FPM_APPARMOR - "FPM SAPI module with AppArmor confinement enabled" + "AppArmor confinement support" ) php_set( @@ -163,7 +163,7 @@ php_set( add_feature_info( "sapi/fpm SELinux" SAPI_FPM_SELINUX - "FPM SAPI module with SELinux policy library support" + "SELinux policy library support" ) php_set( @@ -176,7 +176,7 @@ php_set( add_feature_info( "sapi/fpm systemd" SAPI_FPM_SYSTEMD - "FPM SAPI module with systemd integration" + "systemd integration" ) if(NOT SAPI_FPM) @@ -277,10 +277,10 @@ endif() # Check for clock_get*time. php_search_libraries( clock_gettime - HAVE_CLOCK_GETTIME HEADERS time.h LIBRARIES rt # Solaris 10 + VARIABLE HAVE_CLOCK_GETTIME TARGET php_fpm PRIVATE ) if(NOT HAVE_CLOCK_GETTIME) diff --git a/cmake/sapi/phpdbg/CMakeLists.txt b/cmake/sapi/phpdbg/CMakeLists.txt index d0153360a..af0a6a4dc 100644 --- a/cmake/sapi/phpdbg/CMakeLists.txt +++ b/cmake/sapi/phpdbg/CMakeLists.txt @@ -49,7 +49,6 @@ include(PHP/Install) ################################################################################ option(SAPI_PHPDBG "Enable the phpdbg SAPI module" ON) - add_feature_info( "sapi/phpdbg" SAPI_PHPDBG @@ -63,6 +62,12 @@ cmake_dependent_option( "SAPI_PHPDBG" OFF ) +mark_as_advanced(SAPI_PHPDBG_SHARED) +add_feature_info( + "sapi/phpdbg shared" + SAPI_PHPDBG_SHARED + "dynamically loadable shared object" +) cmake_dependent_option( SAPI_PHPDBG_DEBUG @@ -72,6 +77,11 @@ cmake_dependent_option( OFF ) mark_as_advanced(SAPI_PHPDBG_DEBUG) +add_feature_info( + "sapi/phpdbg debug" + SAPI_PHPDBG_DEBUG + "additional diagnostic output" +) cmake_dependent_option( SAPI_PHPDBG_READLINE @@ -195,6 +205,12 @@ else() message(CHECK_FAIL "disabled") endif() +add_feature_info( + "sapi/phpdbg readline" + HAVE_PHPDBG_READLINE + "support for better command-line accessibility" +) + ################################################################################ # The phpdbg shared library. ################################################################################