Skip to content

Commit 1d833f0

Browse files
petkpetk
committed
Fine tune and sync configure output
1 parent 54ff633 commit 1d833f0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+162
-115
lines changed

‎cmake/CMakeLists.txt‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ cmake_minimum_required(VERSION 3.25...3.31)
33
# Configure CMake behavior.
44
include(cmake/CMakeDefaults.cmake)
55

6-
message(STATUS "-----------------------------")
76
message(STATUS "Initializing PHP build system")
8-
message(STATUS "-----------------------------\n")
7+
message(STATUS "=============================")
8+
message(STATUS "")
99

1010
message(STATUS "CMake version: ${CMAKE_VERSION}")
1111
message(STATUS "CMake generator: ${CMAKE_GENERATOR}")
@@ -31,9 +31,11 @@ add_subdirectory(sapi)
3131
add_subdirectory(ext)
3232
add_subdirectory(Zend)
3333

34-
message(STATUS "---------------")
34+
message(STATUS "")
35+
message(STATUS "")
3536
message(STATUS "Configuring PHP")
36-
message(STATUS "---------------\n")
37+
message(STATUS "===============")
38+
message(STATUS "")
3739

3840
add_subdirectory(pear)
3941
add_subdirectory(win32)

‎cmake/Zend/CMakeLists.txt‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,11 @@ CMake target properties for the `Zend::Zend` target:
3030
compatible with particular PHP build.
3131
#]=============================================================================]
3232

33-
message(STATUS "-----------------------")
33+
message(STATUS "")
34+
message(STATUS "")
3435
message(STATUS "Configuring Zend Engine")
35-
message(STATUS "-----------------------\n")
36+
message(STATUS "=======================")
37+
message(STATUS "")
3638

3739
include(cmake/Version.cmake)
3840

@@ -496,7 +498,7 @@ endif()
496498
add_feature_info(
497499
"Zend signals"
498500
ZEND_SIGNALS
499-
"signals handling within the Zend Engine for performance"
501+
"signal handling for performance"
500502
)
501503

502504
################################################################################

‎cmake/cmake/Bootstrap.cmake‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,11 @@ include(cmake/Configuration.cmake)
5353
# Check requirements.
5454
include(cmake/Requirements.cmake)
5555

56-
message(STATUS "---------------------")
56+
message(STATUS "")
57+
message(STATUS "")
5758
message(STATUS "Running system checks")
58-
message(STATUS "---------------------\n")
59+
message(STATUS "=====================")
60+
message(STATUS "")
5961

6062
# Run PHP configuration checks.
6163
include(cmake/ConfigureChecks.cmake)

‎cmake/cmake/modules/PHP/FeatureSummary.cmake‎

Lines changed: 33 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,32 @@ block()
2525
string(
2626
APPEND
2727
info
28-
" * PHP version: ${PHP_VERSION}\n"
29-
" * PHP API version: ${PHP_API_VERSION}\n"
30-
" * Zend Engine version: ${zendVersion}\n"
31-
" * Zend extension API number: ${zendExtensionApiNumber}\n"
32-
" * Zend module API number: ${zendModuleApiNumber}\n"
28+
" * PHP version ................ : ${PHP_VERSION}\n"
29+
" * PHP API version ............ : ${PHP_API_VERSION}\n"
30+
" * Zend Engine version ........ : ${zendVersion}\n"
31+
" * Zend extension API number .. : ${zendExtensionApiNumber}\n"
32+
" * Zend module API number ..... : ${zendModuleApiNumber}\n"
33+
" * C compiler ................. : ${CMAKE_C_COMPILER_ID} ${CMAKE_C_COMPILER_VERSION} (${CMAKE_C_COMPILER})\n"
3334
)
3435

35-
message(STATUS "-----------")
36+
if(CMAKE_CXX_COMPILER_LOADED)
37+
string(
38+
APPEND
39+
info
40+
" * CXX compiler ............... : ${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION} (${CMAKE_CXX_COMPILER})\n"
41+
)
42+
endif()
43+
44+
string(
45+
APPEND
46+
info
47+
" * Install prefix ............. : ${CMAKE_INSTALL_PREFIX}\n"
48+
)
49+
50+
message(STATUS "")
51+
message(STATUS "")
3652
message(STATUS "PHP summary")
37-
message(STATUS "-----------\n\n${info}")
53+
message(STATUS "===========\n\n${info}")
3854
endblock()
3955

4056
# Output enabled features.
@@ -47,16 +63,22 @@ block()
4763

4864
list(SORT enabledFeatures COMPARE NATURAL CASE INSENSITIVE)
4965

66+
set(php "")
5067
set(sapis "")
5168
set(extensions "")
52-
set(php "")
5369

54-
foreach(feature ${enabledFeatures})
70+
foreach(feature IN LISTS enabledFeatures)
5571
if(parent AND feature MATCHES "^${parent} ")
56-
set(item " * ${feature}")
72+
string(REGEX REPLACE "^${parent}[ ]+" "" item "${feature}")
73+
74+
if(NOT item MATCHES "^(with|without) ")
75+
string(PREPEND item "with ")
76+
endif()
77+
string(PREPEND item " - ")
5778
else()
5879
set(parent "${feature}")
59-
set(item " * ${feature}")
80+
string(REGEX REPLACE "^(ext|sapi)/" "" item "${feature}")
81+
string(PREPEND item " * ")
6082
if(feature MATCHES "^ext/([^ ]+)$")
6183
if(CMAKE_MATCH_1)
6284
get_target_property(type php_${CMAKE_MATCH_1} TYPE)

‎cmake/cmake/modules/PHP/ThreadSafety.cmake‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ function(_php_thread_safety)
3636
message(CHECK_START "Checking whether to enable thread safety (ZTS)")
3737

3838
add_feature_info(
39-
"PHP thread safety (ZTS)"
39+
"Thread safety (ZTS)"
4040
PHP_THREAD_SAFETY
41-
"ensures safe execution in multi-threaded environments"
41+
"safe execution in multi-threaded environments"
4242
)
4343

4444
if(NOT PHP_THREAD_SAFETY)

‎cmake/cmake/presets/all-enabled.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@
114114
"EXT_OPENSSL_SYSTEM_CIPHERS": true,
115115
"EXT_PCRE_EXTERNAL": true,
116116
"EXT_SESSION_MM": true,
117-
"EXT_STANDARD_EXTERNAL_LIBCRYPT": true,
117+
"EXT_STANDARD_EXTERNAL_CRYPT": true,
118118
"EXT_XML_EXPAT": true
119119
}
120120
},

‎cmake/cmake/toolchains/template.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ set(HAVE_FLUSHIO_EXITCODE 1)
166166
set(HAVE_FNMATCH_EXITCODE 0)
167167

168168
# Set the exit codes for the algos checks when using external crypt library
169-
# (EXT_STANDARD_EXTERNAL_LIBCRYPT).
169+
# (EXT_STANDARD_EXTERNAL_CRYPT).
170170
set(_PHP_CRYPT_HAVE_BLOWFISH_EXITCODE 0)
171171
set(_PHP_CRYPT_HAVE_EXT_DES_EXITCODE 0)
172172
set(_PHP_CRYPT_HAVE_MD5_EXITCODE 0)

‎cmake/ext/CMakeLists.txt‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,11 @@ Add subdirectories of PHP extensions.
2626

2727
include(PHP/Extensions)
2828

29-
message(STATUS "--------------------------")
29+
message(STATUS "")
30+
message(STATUS "")
3031
message(STATUS "Configuring PHP extensions")
31-
message(STATUS "--------------------------\n")
32+
message(STATUS "==========================")
33+
message(STATUS "")
3234

3335
define_property(
3436
GLOBAL

‎cmake/ext/bz2/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ option(EXT_BZ2 "Enable the bz2 extension")
3535
add_feature_info(
3636
"ext/bz2"
3737
EXT_BZ2
38-
"support for reading and writing BZip2 (.bz2) compressed files"
38+
"BZip2 (.bz2) compressed archives support"
3939
)
4040

4141
cmake_dependent_option(

‎cmake/ext/curl/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ option(EXT_CURL "Enable the curl extension")
3737
add_feature_info(
3838
"ext/curl"
3939
EXT_CURL
40-
"support for using CURL - Client URL Library"
40+
"CURL (Client URL Library) support"
4141
)
4242

4343
cmake_dependent_option(

0 commit comments

Comments
 (0)