Skip to content

Commit 8e18cf1

Browse files
committed
Update minimum CMake required version to 4.2
This is done to speed up syncing this build system with the upcoming CMake 4.2 version in the very near future and avoid all annoyances from the past versions. Realistically, this build system is at this point in heavy development and is not used yet, so this is feasible.
1 parent 6a61008 commit 8e18cf1

File tree

92 files changed

+90
-230
lines changed

Some content is hidden

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

92 files changed

+90
-230
lines changed

.github/workflows/check.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,5 +50,5 @@ jobs:
5050
run: |
5151
normalizer.cmake -- \
5252
--set normalize_indent_style=false \
53-
--set normalize_cmake_minimum_required=3.29...4.2 \
53+
--set normalize_cmake_minimum_required=4.2...4.3 \
5454
-j

CMakeLists.txt

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ See build system documentation for available PHP configuration variables and
5555
further information.
5656
#]=============================================================================]
5757

58-
cmake_minimum_required(VERSION 3.29...4.2)
58+
cmake_minimum_required(VERSION 4.2...4.3)
5959

6060
if(CMAKE_BINARY_DIR PATH_EQUAL CMAKE_CURRENT_LIST_DIR)
6161
message(
@@ -198,15 +198,7 @@ file(
198198

199199
find_package(Git QUIET)
200200
if(NOT Git_FOUND)
201-
# See: https://gitlab.kitware.com/cmake/cmake/-/merge_requests/10164
202-
if(CMAKE_VERSION VERSION_GREATER_EQUAL 4.0)
203-
find_package(Patch QUIET)
204-
else()
205-
find_program(Patch_EXECUTABLE patch)
206-
if(Patch_EXECUTABLE)
207-
set(Patch_FOUND TRUE)
208-
endif()
209-
endif()
201+
find_package(Patch QUIET)
210202
endif()
211203

212204
if(NOT Git_FOUND AND NOT Patch_FOUND)

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# PHP build system
22

33
[![PHP version](https://img.shields.io/badge/PHP-8.3-777BB4?logo=php&labelColor=17181B)](https://www.php.net/)
4-
[![CMake version](https://img.shields.io/badge/CMake-3.29-064F8C?logo=cmake&labelColor=17181B)](https://cmake.org)
4+
[![CMake version](https://img.shields.io/badge/CMake-4.2-064F8C?logo=cmake&labelColor=17181B)](https://cmake.org)
55
[![C99](https://img.shields.io/badge/standard-C99-A8B9CC?logo=C&labelColor=17181B)](https://www.open-std.org/jtc1/sc22/WG14/www/docs/n1256.pdf)
66

77
> [!IMPORTANT]

cmake/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.29...4.2)
1+
cmake_minimum_required(VERSION 4.2...4.3)
22

33
# Configure CMake behavior.
44
include(cmake/CMakeDefaults.cmake)

cmake/cmake/modules/FindBZip2.cmake

Lines changed: 0 additions & 18 deletions
This file was deleted.

cmake/cmake/modules/FindIconv.cmake

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,7 @@
22
# FindIconv
33
44
This module overrides the upstream CMake `FindIconv` module with few
5-
customizations:
6-
7-
* Included a customization for Alpine where GNU libiconv headers are located in
8-
`/usr/include/gnu-libiconv` (fixed in CMake 3.31):
9-
https://gitlab.kitware.com/cmake/cmake/-/merge_requests/9774
5+
customizations.
106
117
* Added adjustment when the iconv library installation path is manually set,
128
otherwise Iconv is first searched in the C library.

cmake/cmake/modules/FindLibXml2.cmake

Lines changed: 0 additions & 18 deletions
This file was deleted.

cmake/cmake/modules/FindOpenSSL.cmake

Lines changed: 0 additions & 18 deletions
This file was deleted.

cmake/cmake/modules/FindPostgreSQL.cmake

Lines changed: 0 additions & 18 deletions
This file was deleted.

cmake/cmake/modules/PHP/AddCustomCommand/RunCommand.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Expected variables:
1111
* COMMENT
1212
#]=============================================================================]
1313

14-
cmake_minimum_required(VERSION 3.29...4.2)
14+
cmake_minimum_required(VERSION 4.2...4.3)
1515

1616
if(NOT CMAKE_SCRIPT_MODE_FILE OR NOT PHP_EXECUTABLE OR NOT PHP_COMMAND)
1717
return()

0 commit comments

Comments
 (0)