Skip to content

Commit 9ba24e0

Browse files
hnymanAnsuel
authored andcommitted
tools/cmake: update to 4.2.0
Update cmake to version 4.2.0 Release notes at https://cmake.org/cmake/help/v4.2/release/4.2.html Signed-off-by: Hannu Nyman <[email protected]> Link: openwrt/openwrt#20863 Signed-off-by: Christian Marangi <[email protected]>
1 parent 117546b commit 9ba24e0

File tree

6 files changed

+8
-8
lines changed

6 files changed

+8
-8
lines changed

tools/cmake/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77
include $(TOPDIR)/rules.mk
88

99
PKG_NAME:=cmake
10-
PKG_VERSION:=4.1.2
10+
PKG_VERSION:=4.2.0
1111
PKG_VERSION_MAJOR:=$(word 1,$(subst ., ,$(PKG_VERSION))).$(word 2,$(subst ., ,$(PKG_VERSION)))
1212
PKG_RELEASE:=1
1313
PKG_CPE_ID:=cpe:/a:kitware:cmake
1414

1515
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
1616
PKG_SOURCE_URL:=https://github.com/Kitware/CMake/releases/download/v$(PKG_VERSION)/ \
1717
https://cmake.org/files/v$(PKG_VERSION_MAJOR)/
18-
PKG_HASH:=643f04182b7ba323ab31f526f785134fb79cba3188a852206ef0473fee282a15
18+
PKG_HASH:=4104e94657d247c811cb29985405a360b78130b5d51e7f6daceb2447830bd579
1919

2020
HOST_BUILD_PARALLEL:=1
2121
HOST_CONFIGURE_PARALLEL:=1

tools/cmake/patches/110-liblzma.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- a/Modules/FindLibLZMA.cmake
22
+++ b/Modules/FindLibLZMA.cmake
3-
@@ -82,7 +82,13 @@ Finding the liblzma library and linking
3+
@@ -114,7 +114,13 @@ Finding the liblzma library and linking
44
cmake_policy(PUSH)
55
cmake_policy(SET CMP0159 NEW) # file(STRINGS) with REGEX updates CMAKE_MATCH_<n>
66

tools/cmake/patches/130-bootstrap_parallel_make_flag.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- a/bootstrap
22
+++ b/bootstrap
3-
@@ -1520,7 +1520,10 @@ int main(){ printf("1%c", (char)0x0a); r
3+
@@ -1521,7 +1521,10 @@ int main(){ printf("1%c", (char)0x0a); r
44
' > "test.c"
55
cmake_original_make_flags="${cmake_make_flags}"
66
if test "x${cmake_parallel_make}" != "x"; then

tools/cmake/patches/140-zlib.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- a/Modules/FindZLIB.cmake
22
+++ b/Modules/FindZLIB.cmake
3-
@@ -147,10 +147,13 @@ else()
3+
@@ -160,10 +160,13 @@ else()
44
set(ZLIB_NAMES_DEBUG zd zlibd zdlld zlibd1 zlib1d zlibstaticd zlibwapid zlibvcd zlibstatd)
55
endif()
66

tools/cmake/patches/150-zstd-libarchive.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- a/Utilities/cmlibarchive/CMakeLists.txt
22
+++ b/Utilities/cmlibarchive/CMakeLists.txt
3-
@@ -655,7 +655,7 @@ IF(ENABLE_ZSTD)
3+
@@ -669,7 +669,7 @@ IF(ENABLE_ZSTD)
44
SET(ZSTD_FIND_QUIETLY TRUE)
55
ENDIF (ZSTD_INCLUDE_DIR)
66

tools/cmake/patches/160-disable_xcode_generator.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- a/Source/CMakeLists.txt
22
+++ b/Source/CMakeLists.txt
3-
@@ -886,7 +886,7 @@ if(CMake_USE_XCOFF_PARSER)
3+
@@ -903,7 +903,7 @@ if(CMake_USE_XCOFF_PARSER)
44
endif()
55

66
# Xcode only works on Apple
@@ -11,7 +11,7 @@
1111
PRIVATE
1212
--- a/Source/cmake.cxx
1313
+++ b/Source/cmake.cxx
14-
@@ -138,7 +138,7 @@
14+
@@ -143,7 +143,7 @@
1515
# endif
1616
#endif
1717

0 commit comments

Comments
 (0)