Skip to content

Commit 4bae3fb

Browse files
committed
Fix extension dependencies a bit further
This now parses extensions CMakeLists.txt by only the add_dependencies() usage. It sorts, configures extensions in the ext directory and emits warnins or errors in a bit more intuitive manner. Traversing of ext directories is moved to its own CMakeLists.txt for now. PDO* extensions dependent options simplified to regular option(). The configuration "titles" are refactored a bit due to CMake GUIs and all sorts of log formats. For the time being the PHP_SOURCE_DIR is indicator whether the extension is built in the php-src or as a standalone extension.
1 parent 6cfced9 commit 4bae3fb

File tree

16 files changed

+285
-481
lines changed

16 files changed

+285
-481
lines changed

cmake/CMakeLists.txt

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

6-
message(
7-
STATUS
8-
"-----------------------------
9-
Initializing PHP build system
10-
-----------------------------"
11-
)
6+
message(STATUS "-----------------------------")
7+
message(STATUS "Initializing PHP build system")
8+
message(STATUS "-----------------------------\n")
129

1310
message(STATUS "CMake version: ${CMAKE_VERSION}")
1411
message(STATUS "CMake generator: ${CMAKE_GENERATOR}")
@@ -34,12 +31,10 @@ add_subdirectory(sapi)
3431
add_subdirectory(ext)
3532
add_subdirectory(Zend)
3633

37-
message(
38-
STATUS
39-
"---------------
40-
Configuring PHP
41-
---------------"
42-
)
34+
message(STATUS "---------------")
35+
message(STATUS "Configuring PHP")
36+
message(STATUS "---------------\n")
37+
4338
add_subdirectory(pear)
4439
add_subdirectory(TSRM)
4540
add_subdirectory(win32)

cmake/Zend/CMakeLists.txt

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,9 @@
22
# Zend engine.
33
################################################################################
44

5-
message(
6-
STATUS
7-
"-----------------------
8-
Configuring Zend engine
9-
-----------------------"
10-
)
5+
message(STATUS "-----------------------")
6+
message(STATUS "Configuring Zend engine")
7+
message(STATUS "-----------------------\n")
118

129
# Read the Zend engine version.
1310
block(PROPAGATE Zend_VERSION Zend_VERSION_LABEL)

cmake/cmake/Bootstrap.cmake

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,9 @@ include(cmake/Configuration.cmake)
4646
# Check requirements.
4747
include(cmake/Requirements.cmake)
4848

49-
message(
50-
STATUS
51-
"---------------------
52-
Running system checks
53-
---------------------"
54-
)
49+
message(STATUS "---------------------")
50+
message(STATUS "Running system checks")
51+
message(STATUS "---------------------\n")
5552

5653
# Run PHP configuration checks.
5754
include(cmake/ConfigureChecks.cmake)

0 commit comments

Comments
 (0)