From 7f4d0a15df72abb2bc7545edd434def348f6115c Mon Sep 17 00:00:00 2001 From: Peter Kokot Date: Sun, 29 Dec 2024 04:16:57 +0100 Subject: [PATCH] Sync error messages --- cmake/Zend/cmake/Fibers.cmake | 2 +- cmake/cmake/ConfigureChecks.cmake | 4 ++-- cmake/cmake/Flags.cmake | 8 ++++---- cmake/cmake/Requirements.cmake | 6 +++--- cmake/cmake/modules/FindCclient.cmake | 12 +++++------- cmake/cmake/modules/FindDTrace.cmake | 10 +++++----- cmake/cmake/modules/FindMC.cmake | 11 +++++++---- cmake/cmake/modules/PHP/AddCustomCommand.cmake | 2 +- cmake/cmake/modules/PHP/CheckAttribute.cmake | 6 +++--- .../cmake/modules/PHP/CheckCompilerFlag.cmake | 4 ++-- cmake/cmake/modules/PHP/ConfigureFile.cmake | 6 +++--- cmake/cmake/modules/PHP/Extensions.cmake | 2 +- cmake/cmake/modules/PHP/Install.cmake | 2 +- .../cmake/modules/PHP/PkgConfigGenerator.cmake | 18 ++++++++++++------ cmake/cmake/modules/PHP/SearchLibraries.cmake | 6 +++--- cmake/cmake/modules/PHP/Set.cmake | 12 ++++++------ cmake/ext/bz2/CMakeLists.txt | 3 +-- cmake/ext/curl/CMakeLists.txt | 6 +----- cmake/ext/dba/CMakeLists.txt | 8 ++++---- cmake/ext/gd/CMakeLists.txt | 8 ++------ cmake/ext/gettext/CMakeLists.txt | 5 +---- cmake/ext/iconv/CMakeLists.txt | 7 ++----- cmake/ext/ldap/CMakeLists.txt | 4 ++-- cmake/ext/odbc/CMakeLists.txt | 6 +++--- cmake/ext/opcache/cmake/CheckSHM.cmake | 2 +- cmake/ext/pcntl/CMakeLists.txt | 2 +- cmake/ext/pdo_firebird/CMakeLists.txt | 2 +- cmake/ext/pdo_odbc/CMakeLists.txt | 7 ++++--- cmake/ext/pdo_pgsql/CMakeLists.txt | 2 +- cmake/ext/pgsql/CMakeLists.txt | 2 +- cmake/ext/readline/CMakeLists.txt | 2 +- cmake/ext/standard/cmake/CheckCrypt.cmake | 3 ++- cmake/ext/xml/CMakeLists.txt | 2 +- cmake/ext/zip/CMakeLists.txt | 2 +- cmake/sapi/fuzzer/CMakeLists.txt | 2 +- 35 files changed, 90 insertions(+), 96 deletions(-) diff --git a/cmake/Zend/cmake/Fibers.cmake b/cmake/Zend/cmake/Fibers.cmake index e7d280a5..246d4db9 100644 --- a/cmake/Zend/cmake/Fibers.cmake +++ b/cmake/Zend/cmake/Fibers.cmake @@ -192,7 +192,7 @@ block() message(CHECK_FAIL "no") message( FATAL_ERROR - "Fibers are not available on this platform, ucontext.h not found" + "Fibers are not available on this platform, not found." ) endif() message(CHECK_PASS "yes, ucontext") diff --git a/cmake/cmake/ConfigureChecks.cmake b/cmake/cmake/ConfigureChecks.cmake index 41d1a773..76963778 100644 --- a/cmake/cmake/ConfigureChecks.cmake +++ b/cmake/cmake/ConfigureChecks.cmake @@ -619,7 +619,7 @@ php_search_libraries( TARGET php_config INTERFACE ) if(NOT HAVE_INET_NTOP) - message(FATAL_ERROR "Cannot find inet_ntop which is required.") + message(FATAL_ERROR "Cannot find 'inet_ntop()' which is required.") endif() # The inet_pton() is mostly in C library (Solaris 11.4, illumos...) @@ -787,7 +787,7 @@ endif() # Check GCOV. if(PHP_GCOV) if(NOT CMAKE_C_COMPILER_ID STREQUAL "GNU") - message(FATAL_ERROR "GCC is required for using PHP_GCOV='ON'") + message(FATAL_ERROR "GCC is required for using PHP_GCOV='ON'.") endif() if(CMAKE_C_COMPILER_LAUNCHER MATCHES "ccache") diff --git a/cmake/cmake/Flags.cmake b/cmake/cmake/Flags.cmake index e5529d9d..26693386 100644 --- a/cmake/cmake/Flags.cmake +++ b/cmake/cmake/Flags.cmake @@ -182,7 +182,7 @@ endif() if(PHP_MEMORY_SANITIZER AND PHP_ADDRESS_SANITIZER) message( FATAL_ERROR - "MemorySanitizer and AddressSanitizer are mutually exclusive" + "MemorySanitizer and AddressSanitizer are mutually exclusive." ) endif() @@ -228,7 +228,7 @@ if(PHP_MEMORY_SANITIZER) message(CHECK_PASS "Success") else() message(CHECK_FAIL "Failed") - message(FATAL_ERROR "MemorySanitizer is not available") + message(FATAL_ERROR "MemorySanitizer is not available.") endif() endif() @@ -276,7 +276,7 @@ if(PHP_ADDRESS_SANITIZER) message(CHECK_PASS "Success") else() message(CHECK_FAIL "Failed") - message(FATAL_ERROR "AddressSanitizer is not available") + message(FATAL_ERROR "AddressSanitizer is not available.") endif() endif() @@ -411,7 +411,7 @@ if(PHP_UNDEFINED_SANITIZER) message(CHECK_PASS "Success") else() message(CHECK_FAIL "Failed") - message(FATAL_ERROR "UndefinedBehaviorSanitizer is not available") + message(FATAL_ERROR "UndefinedBehaviorSanitizer is not available.") endif() endif() diff --git a/cmake/cmake/Requirements.cmake b/cmake/cmake/Requirements.cmake index 741baad1..4ea0926e 100644 --- a/cmake/cmake/Requirements.cmake +++ b/cmake/cmake/Requirements.cmake @@ -16,8 +16,8 @@ if(CMAKE_C_COMPILER_ID STREQUAL "SunPro") FATAL_ERROR "Using unsupported compiler: Oracle Developer Studio.\n" "Please, install a compatible C compiler such as GNU C or Clang. You can " - "set CMAKE_C_COMPILER (and CMAKE_CXX_COMPILER) to the compiler path on the " - "system." + "set 'CMAKE_C_COMPILER' (and 'CMAKE_CXX_COMPILER') variables to the " + "compiler path on the system." ) endif() @@ -40,7 +40,7 @@ cmake_pop_check_state() if(PHP_IS_EBCDIC) message(CHECK_FAIL "EBCDIC") - message(FATAL_ERROR "PHP does not support EBCDIC targets") + message(FATAL_ERROR "PHP does not support EBCDIC targets.") else() message(CHECK_PASS "ASCII") endif() diff --git a/cmake/cmake/modules/FindCclient.cmake b/cmake/cmake/modules/FindCclient.cmake index 08d3c1b3..9742a02b 100644 --- a/cmake/cmake/modules/FindCclient.cmake +++ b/cmake/cmake/modules/FindCclient.cmake @@ -296,17 +296,15 @@ if(Cclient_INCLUDE_DIR AND Cclient_LIBRARY) string( APPEND _reason - "Sanity check failed: utf8_mime2text() has new signature, but " - "U8T_CANONICAL is missing. This should not happen. Check CMake logs for " - "additional information. " + "Sanity check failed: 'utf8_mime2text()' has new signature, but " + "'U8T_CANONICAL' is missing. This should not happen. " ) elseif(NOT HAVE_NEW_MIME2TEXT AND _HAVE_U8T_DECOMPOSE) string( APPEND _reason - "Sanity check failed: utf8_mime2text() has old signature, but " - "U8T_CANONICAL is present. This should not happen. Check CMake logs for " - "additional information." + "Sanity check failed: 'utf8_mime2text()' has old signature, but " + "'U8T_CANONICAL' is present. This should not happen. " ) else() set(_cclient_sanity_check_2 TRUE) @@ -314,7 +312,7 @@ if(Cclient_INCLUDE_DIR AND Cclient_LIBRARY) endif() if(NOT _cclient_sanity_check_2) - string(APPEND _reason "Sanity check failed: mail_newbody() not found. ") + string(APPEND _reason "Sanity check failed: 'mail_newbody()' not found. ") endif() ################################################################################ diff --git a/cmake/cmake/modules/FindDTrace.cmake b/cmake/cmake/modules/FindDTrace.cmake index f394bf5c..7d42cf2e 100644 --- a/cmake/cmake/modules/FindDTrace.cmake +++ b/cmake/cmake/modules/FindDTrace.cmake @@ -138,7 +138,7 @@ function(dtrace_target) ) if(parsed_UNPARSED_ARGUMENTS) - message(FATAL_ERROR "Bad arguments: ${parsed_UNPARSED_ARGUMENTS}") + message(FATAL_ERROR "Unrecognized arguments: ${parsed_UNPARSED_ARGUMENTS}") endif() if(parsed_KEYWORDS_MISSING_VALUES) @@ -146,19 +146,19 @@ function(dtrace_target) endif() if(NOT ARGV0) - message(FATAL_ERROR "dtrace_target expects a target name") + message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} expects a target name.") endif() if(NOT parsed_INPUT) - message(FATAL_ERROR "dtrace_target expects an input filename") + message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} expects an input filename.") endif() if(NOT parsed_HEADER) - message(FATAL_ERROR "dtrace_target expects a header filename") + message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} expects a header filename.") endif() if(NOT parsed_SOURCES) - message(FATAL_ERROR "dtrace_target expects a list of source files") + message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} expects source files.") endif() if(NOT IS_ABSOLUTE "${parsed_INPUT}") diff --git a/cmake/cmake/modules/FindMC.cmake b/cmake/cmake/modules/FindMC.cmake index 74eb53d0..956d8a40 100644 --- a/cmake/cmake/modules/FindMC.cmake +++ b/cmake/cmake/modules/FindMC.cmake @@ -160,7 +160,7 @@ function(mc_target) ) if(parsed_UNPARSED_ARGUMENTS) - message(FATAL_ERROR "Bad arguments: ${parsed_UNPARSED_ARGUMENTS}") + message(FATAL_ERROR "Unrecognized arguments: ${parsed_UNPARSED_ARGUMENTS}") endif() if(parsed_KEYWORDS_MISSING_VALUES) @@ -168,15 +168,18 @@ function(mc_target) endif() if(NOT parsed_NAME) - message(FATAL_ERROR "mc_target expects a target name") + message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} expects a target name.") endif() if(NOT parsed_INPUT) - message(FATAL_ERROR "mc_target expects an input filename") + message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} expects an input filename.") endif() if(NOT MC_FOUND) - message(WARNING "[MC][${parsed_NAME}] Message compiler is missing. Skipping") + message( + WARNING + "[MC][${parsed_NAME}] Message compiler is missing. Skipping." + ) return() endif() diff --git a/cmake/cmake/modules/PHP/AddCustomCommand.cmake b/cmake/cmake/modules/PHP/AddCustomCommand.cmake index 8567a148..84f10cb7 100644 --- a/cmake/cmake/modules/PHP/AddCustomCommand.cmake +++ b/cmake/cmake/modules/PHP/AddCustomCommand.cmake @@ -69,7 +69,7 @@ function(php_add_custom_command) ) if(parsed_UNPARSED_ARGUMENTS) - message(FATAL_ERROR "Bad arguments: ${parsed_UNPARSED_ARGUMENTS}") + message(FATAL_ERROR "Unrecognized arguments: ${parsed_UNPARSED_ARGUMENTS}") endif() if(NOT ARGV0) diff --git a/cmake/cmake/modules/PHP/CheckAttribute.cmake b/cmake/cmake/modules/PHP/CheckAttribute.cmake index 8381e46a..991ded3a 100644 --- a/cmake/cmake/modules/PHP/CheckAttribute.cmake +++ b/cmake/cmake/modules/PHP/CheckAttribute.cmake @@ -92,11 +92,11 @@ function(_php_check_attribute what attribute result) ) if(parsed_UNPARSED_ARGUMENTS) - message(FATAL_ERROR "Bad arguments: ${parsed_UNPARSED_ARGUMENTS}") + message(FATAL_ERROR "Unrecognized arguments: ${parsed_UNPARSED_ARGUMENTS}") endif() if(NOT ARGC EQUAL 3) - message(FATAL_ERROR "Missing arguments") + message(FATAL_ERROR "Missing arguments.") endif() if(NOT what MATCHES "^(function|variable)$") @@ -118,7 +118,7 @@ function(_php_check_attribute what attribute result) cmake_language(CALL _php_check_attribute_get_${what}_code ${attribute} code) if(NOT code) - message(FATAL_ERROR "Unsupported attribute '${attribute}'") + message(FATAL_ERROR "Unsupported attribute '${attribute}'.") endif() check_source_compiles(C "${code}" ${result}) diff --git a/cmake/cmake/modules/PHP/CheckCompilerFlag.cmake b/cmake/cmake/modules/PHP/CheckCompilerFlag.cmake index d5841da2..d64b49a0 100644 --- a/cmake/cmake/modules/PHP/CheckCompilerFlag.cmake +++ b/cmake/cmake/modules/PHP/CheckCompilerFlag.cmake @@ -58,11 +58,11 @@ function(php_check_compiler_flag lang flag result) ) if(parsed_UNPARSED_ARGUMENTS) - message(FATAL_ERROR "Bad arguments: ${parsed_UNPARSED_ARGUMENTS}") + message(FATAL_ERROR "Unrecognized arguments: ${parsed_UNPARSED_ARGUMENTS}") endif() if(NOT ARGC EQUAL 3) - message(FATAL_ERROR "Missing arguments") + message(FATAL_ERROR "Missing arguments.") endif() if(NOT CMAKE_REQUIRED_QUIET) diff --git a/cmake/cmake/modules/PHP/ConfigureFile.cmake b/cmake/cmake/modules/PHP/ConfigureFile.cmake index 8605ba91..490449e7 100644 --- a/cmake/cmake/modules/PHP/ConfigureFile.cmake +++ b/cmake/cmake/modules/PHP/ConfigureFile.cmake @@ -57,13 +57,13 @@ function(_php_configure_file_parse_variables) ) if(parsed_UNPARSED_ARGUMENTS) - message(FATAL_ERROR "Bad arguments: ${parsed_UNPARSED_ARGUMENTS}") + message(FATAL_ERROR "Unrecognized arguments: ${parsed_UNPARSED_ARGUMENTS}") endif() if(NOT ARGV0) message( FATAL_ERROR - "${CMAKE_CURRENT_FUNCTION} expects 1st argument" + "${CMAKE_CURRENT_FUNCTION} expects 1st argument." ) endif() @@ -153,7 +153,7 @@ function(php_configure_file) ) if(parsed_UNPARSED_ARGUMENTS) - message(FATAL_ERROR "Bad arguments: ${parsed_UNPARSED_ARGUMENTS}") + message(FATAL_ERROR "Unrecognized arguments: ${parsed_UNPARSED_ARGUMENTS}") endif() if(NOT parsed_INPUT AND NOT parsed_CONTENT) diff --git a/cmake/cmake/modules/PHP/Extensions.cmake b/cmake/cmake/modules/PHP/Extensions.cmake index b9949353..d48755ef 100644 --- a/cmake/cmake/modules/PHP/Extensions.cmake +++ b/cmake/cmake/modules/PHP/Extensions.cmake @@ -142,7 +142,7 @@ function(_php_extensions_sort) ) if(parsed_UNPARSED_ARGUMENTS) - message(FATAL_ERROR "Bad arguments: ${parsed_UNPARSED_ARGUMENTS}") + message(FATAL_ERROR "Unrecognized arguments: ${parsed_UNPARSED_ARGUMENTS}") endif() set(result ${ARGV0}) diff --git a/cmake/cmake/modules/PHP/Install.cmake b/cmake/cmake/modules/PHP/Install.cmake index 319f2b55..d64c774d 100644 --- a/cmake/cmake/modules/PHP/Install.cmake +++ b/cmake/cmake/modules/PHP/Install.cmake @@ -59,7 +59,7 @@ function(_php_install_set_absolute_special var) else() message( FATAL_ERROR - "CMAKE_INSTALL_${var} is not a special-case GNU standard variable") + "CMAKE_INSTALL_${var} is not a special-case GNU standard variable.") endif() if(IS_ABSOLUTE "${CMAKE_INSTALL_${var}}") diff --git a/cmake/cmake/modules/PHP/PkgConfigGenerator.cmake b/cmake/cmake/modules/PHP/PkgConfigGenerator.cmake index 4c771fc4..ef1c7d8b 100644 --- a/cmake/cmake/modules/PHP/PkgConfigGenerator.cmake +++ b/cmake/cmake/modules/PHP/PkgConfigGenerator.cmake @@ -67,8 +67,8 @@ function(_pkgconfig_parse_variables variables) if(NOT modulus EQUAL 0) message( FATAL_ERROR - "The keyword VARIABLES must be a list of pairs - variable-name and " - "value (it must contain an even number of items)." + "The keyword VARIABLES must be a list of pairs - variable-name and value " + "(it must contain an even number of items)." ) endif() @@ -138,19 +138,25 @@ function(pkgconfig_generate_pc) ) if(parsed_UNPARSED_ARGUMENTS) - message(FATAL_ERROR "Bad arguments: ${parsed_UNPARSED_ARGUMENTS}") + message(FATAL_ERROR "Unrecognized arguments: ${parsed_UNPARSED_ARGUMENTS}") endif() if(parsed_TARGET AND NOT TARGET ${parsed_TARGET}) - message(FATAL_ERROR "${parsed_TARGET} is not a target") + message(FATAL_ERROR "${parsed_TARGET} is not a target.") endif() if(NOT ARGV0) - message(FATAL_ERROR "pkgconfig_generate_pc expects a template file name") + message( + FATAL_ERROR + "${CMAKE_CURRENT_FUNCTION} expects a template file name." + ) endif() if(NOT ARGV1) - message(FATAL_ERROR "pkgconfig_generate_pc expects an output file name") + message( + FATAL_ERROR + "${CMAKE_CURRENT_FUNCTION} expects an output file name." + ) endif() set(template "${ARGV0}") diff --git a/cmake/cmake/modules/PHP/SearchLibraries.cmake b/cmake/cmake/modules/PHP/SearchLibraries.cmake index 00c5f869..962f9d5d 100644 --- a/cmake/cmake/modules/PHP/SearchLibraries.cmake +++ b/cmake/cmake/modules/PHP/SearchLibraries.cmake @@ -182,11 +182,11 @@ function(php_search_libraries) ) if(parsed_UNPARSED_ARGUMENTS) - message(FATAL_ERROR "Bad arguments: ${parsed_UNPARSED_ARGUMENTS}") + message(FATAL_ERROR "Unrecognized arguments: ${parsed_UNPARSED_ARGUMENTS}") endif() if(NOT parsed_HEADERS) - message(FATAL_ERROR "php_search_libraries: missing HEADERS") + message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION}: missing HEADERS") endif() set(symbol ${ARGV0}) @@ -220,7 +220,7 @@ function(php_search_libraries) list(GET parsed_TARGET 0 target) if(NOT TARGET ${target}) - message(FATAL_ERROR "Bad TARGET arguments: ${target} is not a target") + message(FATAL_ERROR "Bad TARGET arguments: ${target} is not a target.") endif() list(LENGTH parsed_TARGET length) diff --git a/cmake/cmake/modules/PHP/Set.cmake b/cmake/cmake/modules/PHP/Set.cmake index b787ecd0..3ae50243 100644 --- a/cmake/cmake/modules/PHP/Set.cmake +++ b/cmake/cmake/modules/PHP/Set.cmake @@ -323,14 +323,14 @@ endfunction() # Validate parsed arguments. function(_php_set_validate_arguments arguments) if(parsed_UNPARSED_ARGUMENTS) - message(FATAL_ERROR "Bad arguments: ${parsed_UNPARSED_ARGUMENTS}") + message(FATAL_ERROR "Unrecognized arguments: ${parsed_UNPARSED_ARGUMENTS}") endif() if( NOT DEFINED parsed_VALUE AND (NOT DEFINED parsed_CHOICES OR NOT parsed_TYPE STREQUAL "STRING") ) - message(FATAL_ERROR "Missing VALUE argument") + message(FATAL_ERROR "Missing VALUE argument.") endif() if(NOT parsed_TYPE) @@ -340,22 +340,22 @@ function(_php_set_validate_arguments arguments) endif() if(DEFINED parsed_CHOICES AND NOT parsed_TYPE STREQUAL "STRING") - message(FATAL_ERROR "CHOICES argument can be only used with TYPE STRING") + message(FATAL_ERROR "CHOICES argument can be only used with TYPE STRING.") endif() list(FIND arguments ELSE_VALUE elseValueIndex) if(NOT DEFINED parsed_IF AND NOT elseValueIndex EQUAL -1) - message(FATAL_ERROR "Redundant ELSE_VALUE argument without IF condition") + message(FATAL_ERROR "Redundant ELSE_VALUE argument without IF condition.") elseif( DEFINED parsed_IF AND NOT DEFINED parsed_ELSE_VALUE AND NOT elseValueIndex EQUAL -1 ) - message(FATAL_ERROR "Missing ELSE_VALUE argument") + message(FATAL_ERROR "Missing ELSE_VALUE argument.") endif() if(NOT DEFINED parsed_DOC) - message(FATAL_ERROR "Missing DOC argument") + message(FATAL_ERROR "Missing DOC argument.") endif() endfunction() diff --git a/cmake/ext/bz2/CMakeLists.txt b/cmake/ext/bz2/CMakeLists.txt index 2f8170cb..ae6ff7e4 100644 --- a/cmake/ext/bz2/CMakeLists.txt +++ b/cmake/ext/bz2/CMakeLists.txt @@ -89,8 +89,7 @@ if(TARGET BZip2::BZip2) message( FATAL_ERROR "BZip2 package is not working as expected. The bz2 extension requires " - "BZip2 library (libbzip2) version ${PHP_BZIP2_MIN_VERSION} or later. " - "Please see the CMake logs." + "BZip2 library (libbzip2) version ${PHP_BZIP2_MIN_VERSION} or later." ) endif() endif() diff --git a/cmake/ext/curl/CMakeLists.txt b/cmake/ext/curl/CMakeLists.txt index def40d53..2b48e59d 100644 --- a/cmake/ext/curl/CMakeLists.txt +++ b/cmake/ext/curl/CMakeLists.txt @@ -172,11 +172,7 @@ if(TARGET CURL::libcurl) ) if(NOT HAVE_CURL_EASY_PERFORM) - message( - FATAL_ERROR - "The curl_easy_perform() couldn't be found. Please check logs for more " - "information." - ) + message(FATAL_ERROR "The 'curl_easy_perform()' couldn't be found.") endif() endif() diff --git a/cmake/ext/dba/CMakeLists.txt b/cmake/ext/dba/CMakeLists.txt index f6086d3a..a9dbaf06 100644 --- a/cmake/ext/dba/CMakeLists.txt +++ b/cmake/ext/dba/CMakeLists.txt @@ -286,14 +286,14 @@ add_feature_info( if(PHP_EXT_DBA_QDBM AND PHP_EXT_DBA_GDBM) message( FATAL_ERROR - "You cannot combine PHP_EXT_DBA_GDBM with PHP_EXT_DBA_QDBM. Please select " - "either GDBM or QDBM." + "You cannot combine 'PHP_EXT_DBA_GDBM' with 'PHP_EXT_DBA_QDBM'. Please " + "select either GDBM or QDBM." ) elseif(PHP_EXT_DBA_QDBM AND PHP_EXT_DBA_DBM) message( FATAL_ERROR - "You cannot combine PHP_EXT_DBA_DBM with PHP_EXT_DBA_QDBM. Please select " - "either DBM or QDBM." + "You cannot combine 'PHP_EXT_DBA_DBM' with 'PHP_EXT_DBA_QDBM'. Please " + "select either DBM or QDBM." ) endif() diff --git a/cmake/ext/gd/CMakeLists.txt b/cmake/ext/gd/CMakeLists.txt index 2890e480..97ce1f6e 100644 --- a/cmake/ext/gd/CMakeLists.txt +++ b/cmake/ext/gd/CMakeLists.txt @@ -444,10 +444,7 @@ if(NOT PHP_EXT_GD_EXTERNAL) cmake_pop_check_state() if(NOT _GD_SANITY_CHECK_COMPILES) - message( - FATAL_ERROR - "GD build test failed. Please check logs for details." - ) + message(FATAL_ERROR "GD sanity check failed.") endif() endif() endblock() @@ -471,8 +468,7 @@ else() if(NOT HAVE_LIBGD) message( FATAL_ERROR - "GD build test failed to find gdImageCreate in libgd. Please check the " - "logs for details." + "GD sanity check failed: 'gdImageCreate()' could not be found in libgd." ) endif() diff --git a/cmake/ext/gettext/CMakeLists.txt b/cmake/ext/gettext/CMakeLists.txt index 9bf2c961..fbf4cf16 100644 --- a/cmake/ext/gettext/CMakeLists.txt +++ b/cmake/ext/gettext/CMakeLists.txt @@ -78,10 +78,7 @@ if(TARGET Intl::Intl) check_library_exists(Intl::Intl bindtextdomain "" _HAVE_BINDTEXTDOMAIN) if(NOT _HAVE_BINDTEXTDOMAIN) - message( - FATAL_ERROR - "Unable to find required gettext library. Please check the logs." - ) + message(FATAL_ERROR "Unable to find the required gettext library.") endif() set(HAVE_LIBINTL TRUE) diff --git a/cmake/ext/iconv/CMakeLists.txt b/cmake/ext/iconv/CMakeLists.txt index 739b5ff4..4283d5f9 100644 --- a/cmake/ext/iconv/CMakeLists.txt +++ b/cmake/ext/iconv/CMakeLists.txt @@ -111,7 +111,7 @@ if(TARGET Iconv::Iconv) if(NOT _HAVE_ICONV AND NOT HAVE_LIBICONV) message( FATAL_ERROR - "The iconv sanity check failed. Neither iconv() or libiconv() functions " + "Iconv sanity check failed: neither 'iconv()' nor 'libiconv()' function " "could be found." ) endif() @@ -205,10 +205,7 @@ if(TARGET Iconv::Iconv) message(CHECK_PASS "yes") else() message(CHECK_PASS "no") - message( - FATAL_ERROR - "The iconv errno sanity check failed. Please check logs for details." - ) + message(FATAL_ERROR "The iconv 'errno' sanity check failed.") endif() message(CHECK_START "Checking if iconv supports //IGNORE") diff --git a/cmake/ext/ldap/CMakeLists.txt b/cmake/ext/ldap/CMakeLists.txt index f632dbfe..e61e05f0 100644 --- a/cmake/ext/ldap/CMakeLists.txt +++ b/cmake/ext/ldap/CMakeLists.txt @@ -105,8 +105,8 @@ if(TARGET LDAP::LDAP) if(NOT _HAVE_LDAP_SASL_BIND_S AND NOT _HAVE_LDAP_SIMPLE_BIND_S) message( FATAL_ERROR - "LDAP sanity check failed: ldap_sasl_bind_s() or ldap_simple_bind_s() " - "not found. " + "LDAP sanity check failed: neither 'ldap_sasl_bind_s()' nor " + "'ldap_simple_bind_s()' function could be found." ) endif() diff --git a/cmake/ext/odbc/CMakeLists.txt b/cmake/ext/odbc/CMakeLists.txt index 78dcf5cc..42a068bf 100644 --- a/cmake/ext/odbc/CMakeLists.txt +++ b/cmake/ext/odbc/CMakeLists.txt @@ -244,8 +244,8 @@ if( ) message( FATAL_ERROR - "When using PHP_EXT_ODBC_TYPE=${PHP_EXT_ODBC_TYPE}, please set also " - "ODBC_LIBRARY and optionally ODBC_INCLUDE_DIR to locate the ODBC " + "When using 'PHP_EXT_ODBC_TYPE=${PHP_EXT_ODBC_TYPE}', please set also " + "'ODBC_LIBRARY' and optionally 'ODBC_INCLUDE_DIR' to locate the ODBC " "installation." ) endif() @@ -317,7 +317,7 @@ if(PHP_EXT_ODBC_TYPE STREQUAL "ibm-db2" AND TARGET ODBC::ODBC) check_library_exists(ODBC::ODBC "" SQLExecute HAVE_SQLEXECUTE) cmake_pop_check_state() if(NOT HAVE_SQLCLI1_H) - message(FATAL_ERROR "Required header file not found") + message(FATAL_ERROR "Required header file not found.") endif() if(NOT HAVE_SQLEXECUTE) message( diff --git a/cmake/ext/opcache/cmake/CheckSHM.cmake b/cmake/ext/opcache/cmake/CheckSHM.cmake index fda17cdd..f3199885 100644 --- a/cmake/ext/opcache/cmake/CheckSHM.cmake +++ b/cmake/ext/opcache/cmake/CheckSHM.cmake @@ -301,6 +301,6 @@ if(NOT HAVE_SHM_IPC AND NOT HAVE_SHM_MMAP_ANON AND NOT HAVE_SHM_MMAP_POSIX) message( FATAL_ERROR "No supported shared memory caching support was found when configuring " - "opcache. Please check CMake logs for any errors or missing dependencies." + "opcache extension." ) endif() diff --git a/cmake/ext/pcntl/CMakeLists.txt b/cmake/ext/pcntl/CMakeLists.txt index a582a487..6a06ce4a 100644 --- a/cmake/ext/pcntl/CMakeLists.txt +++ b/cmake/ext/pcntl/CMakeLists.txt @@ -90,7 +90,7 @@ block() if(NOT HAVE_${const}) message( FATAL_ERROR - "ext/pcntl: required function ${function}() not found." + "ext/pcntl: required function '${function}()' not found." ) endif() endforeach() diff --git a/cmake/ext/pdo_firebird/CMakeLists.txt b/cmake/ext/pdo_firebird/CMakeLists.txt index 51142b4b..4b585a27 100644 --- a/cmake/ext/pdo_firebird/CMakeLists.txt +++ b/cmake/ext/pdo_firebird/CMakeLists.txt @@ -92,7 +92,7 @@ if(TARGET Firebird::Firebird) if(NOT _php_ext_pdo_firebird_sanity_check) message( FATAL_ERROR - "Firebird sanity check failed: isc_detach_database() not found." + "Firebird sanity check failed: 'isc_detach_database()' not found." ) endif() endif() diff --git a/cmake/ext/pdo_odbc/CMakeLists.txt b/cmake/ext/pdo_odbc/CMakeLists.txt index 9eea465c..949b777e 100644 --- a/cmake/ext/pdo_odbc/CMakeLists.txt +++ b/cmake/ext/pdo_odbc/CMakeLists.txt @@ -123,8 +123,8 @@ if( ) message( FATAL_ERROR - "When using PHP_EXT_PDO_ODBC_TYPE=${PHP_EXT_PDO_ODBC_TYPE}, please set " - "also ODBC_LIBRARY and optionally ODBC_INCLUDE_DIR to find the ODBC " + "When using 'PHP_EXT_PDO_ODBC_TYPE=${PHP_EXT_PDO_ODBC_TYPE}', please set " + "also 'ODBC_LIBRARY' and optionally 'ODBC_INCLUDE_DIR' to find the ODBC " "installation." ) endif() @@ -218,7 +218,8 @@ if(TARGET ODBC::ODBC) if(NOT haveSomeHeaders) message( FATAL_ERROR - "Could not found any of the ODBC header files to build pdo_odbc extension" + "Could not find any of the ODBC header files to build pdo_odbc " + "extension." ) endif() endblock() diff --git a/cmake/ext/pdo_pgsql/CMakeLists.txt b/cmake/ext/pdo_pgsql/CMakeLists.txt index f13a05ed..968565a4 100644 --- a/cmake/ext/pdo_pgsql/CMakeLists.txt +++ b/cmake/ext/pdo_pgsql/CMakeLists.txt @@ -90,7 +90,7 @@ if(TARGET PostgreSQL::PostgreSQL) message( FATAL_ERROR "PostgreSQL check failed: libpq ${PHP_POSTGRESQL_MIN_VERSION} or later " - "is required, please see CMake logs for details." + "is required." ) endif() endif() diff --git a/cmake/ext/pgsql/CMakeLists.txt b/cmake/ext/pgsql/CMakeLists.txt index 25d6414c..9555cc76 100644 --- a/cmake/ext/pgsql/CMakeLists.txt +++ b/cmake/ext/pgsql/CMakeLists.txt @@ -88,7 +88,7 @@ if(TARGET PostgreSQL::PostgreSQL) message( FATAL_ERROR "PostgreSQL check failed: libpq ${PHP_POSTGRESQL_MIN_VERSION} or later " - "is required, please see CMake logs for details." + "is required." ) endif() diff --git a/cmake/ext/readline/CMakeLists.txt b/cmake/ext/readline/CMakeLists.txt index dd547bd6..d1e41f38 100644 --- a/cmake/ext/readline/CMakeLists.txt +++ b/cmake/ext/readline/CMakeLists.txt @@ -178,7 +178,7 @@ else() FATAL_ERROR "Readline library check failed. Variable rl_pending_input missing. " "This version of Readline installation is not supported. Try using " - "libedit instead (set PHP_EXT_READLINE_LIBREADLINE to 'OFF')." + "libedit instead (set 'PHP_EXT_READLINE_LIBREADLINE' to 'OFF')." ) endif() diff --git a/cmake/ext/standard/cmake/CheckCrypt.cmake b/cmake/ext/standard/cmake/CheckCrypt.cmake index 4d0c1b68..b225b837 100644 --- a/cmake/ext/standard/cmake/CheckCrypt.cmake +++ b/cmake/ext/standard/cmake/CheckCrypt.cmake @@ -415,7 +415,8 @@ block() if(NOT result) message( FATAL_ERROR - "Cannot use external crypt library as crypt_r() style could not be detected." + "Cannot use external crypt library as 'crypt_r()' style could not be " + "detected." ) endif() diff --git a/cmake/ext/xml/CMakeLists.txt b/cmake/ext/xml/CMakeLists.txt index d1ab13e0..e159bab0 100644 --- a/cmake/ext/xml/CMakeLists.txt +++ b/cmake/ext/xml/CMakeLists.txt @@ -93,7 +93,7 @@ if(NOT PHP_EXT_LIBXML AND NOT PHP_EXT_XML_EXPAT) message( FATAL_ERROR "The xml extension requires either libxml extension or Expat library. Set " - "PHP_EXT_LIBXML=ON or PHP_EXT_XML_EXPAT=ON" + "'PHP_EXT_LIBXML' to 'ON', or 'PHP_EXT_XML_EXPAT' to 'ON'." ) endif() diff --git a/cmake/ext/zip/CMakeLists.txt b/cmake/ext/zip/CMakeLists.txt index 22cf42a7..b85731f6 100644 --- a/cmake/ext/zip/CMakeLists.txt +++ b/cmake/ext/zip/CMakeLists.txt @@ -84,7 +84,7 @@ endif() if(libzip_VERSION VERSION_EQUAL 1.3.1 OR libzip_VERSION VERSION_EQUAL 1.7.0) message( FATAL_ERROR - "ext/zip: libzip ${libzip_VERSION} is not supported. Try upgrading libzip" + "ext/zip: libzip ${libzip_VERSION} is not supported. Try upgrading libzip." ) endif() diff --git a/cmake/sapi/fuzzer/CMakeLists.txt b/cmake/sapi/fuzzer/CMakeLists.txt index 9aa22fb6..8393dd51 100644 --- a/cmake/sapi/fuzzer/CMakeLists.txt +++ b/cmake/sapi/fuzzer/CMakeLists.txt @@ -112,7 +112,7 @@ else() FATAL_ERROR "The fuzzer SAPI cannot be enabled. C++ compiler " "${CMAKE_CXX_COMPILER_ID} doesn't support the -fsanitize=fuzzer-no-link " - "option" + "option." ) endif()