cmake: bump to version 3.15.4
Remove FindLibUV patch which is now upstream. Resync/reformat rename cmake rootfile patch for 3.15.4 with git format-patch. Copyright.txt has updated copyright year and added some authors. Signed-off-by: James Hilliard <james.hilliard1@gmail.com> Reviewed-by: Adrian Perez de Castro <aperez@igalia.com> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>2019.11.x
James Hilliard
Arnout Vandecappelle (Essensium/Mind)
parent
7991f09307
commit
ce34cf0ae3
|
|
@ -1,3 +1,8 @@
|
|||
From 68d3b1dfbbd2f54bf81986d1d733deaf66658b15 Mon Sep 17 00:00:00 2001
|
||||
From: Davide Viti <zinosat@tiscali.it>
|
||||
Date: Thu, 14 Jul 2016 10:14:59 +0100
|
||||
Subject: [PATCH] rename cmake rootfile
|
||||
|
||||
ctest fails on the target, because it cannot find CMake.cmake inside
|
||||
CMAKE_DATA_DIR (typically set to "/usr/share/cmake-3.0"): all *.cmake
|
||||
files are removed at build time via the target-finalize rule.
|
||||
|
|
@ -6,24 +11,33 @@ This buildroot-specific patch makes sure ctest looks also for
|
|||
"Modules/CMake.cmake.ctest" before complaining
|
||||
|
||||
[Vincent: tweak patch for 3.6.3]
|
||||
[James: tweak patch for 3.15.4]
|
||||
|
||||
Signed-off-by: Davide Viti <zinosat@tiscali.it>
|
||||
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
|
||||
Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
|
||||
---
|
||||
Source/cmake.cxx | 7 ++++++-
|
||||
1 file changed, 6 insertions(+), 1 deletion(-)
|
||||
|
||||
diff -rup a/Source/cmake.cxx b/Source/cmake.cxx
|
||||
--- a/Source/cmake.cxx 2016-07-07 15:47:27.000000000 +0100
|
||||
+++ b/Source/cmake.cxx 2016-07-14 10:14:59.914265515 +0100
|
||||
@@ -771,7 +771,12 @@ int cmake::AddCMakePaths()
|
||||
"Path to cpack program executable.", cmState::INTERNAL);
|
||||
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
|
||||
index 3772f09985..c317e4af38 100644
|
||||
--- a/Source/cmake.cxx
|
||||
+++ b/Source/cmake.cxx
|
||||
@@ -1009,7 +1009,12 @@ int cmake::AddCMakePaths()
|
||||
"Path to cpack program executable.", cmStateEnums::INTERNAL);
|
||||
#endif
|
||||
if (!cmSystemTools::FileExists(
|
||||
- (cmSystemTools::GetCMakeRoot() + "/Modules/CMake.cmake").c_str())) {
|
||||
+ (cmSystemTools::GetCMakeRoot() + "/Modules/CMake.cmake").c_str()) &&
|
||||
+ !cmSystemTools::FileExists(
|
||||
+ (cmSystemTools::GetCMakeRoot()+"/Modules/CMake.cmake.ctest").c_str()
|
||||
- (cmSystemTools::GetCMakeRoot() + "/Modules/CMake.cmake"))) {
|
||||
+ (cmSystemTools::GetCMakeRoot() + "/Modules/CMake.cmake")) &&
|
||||
+ !cmSystemTools::FileExists(
|
||||
+ (cmSystemTools::GetCMakeRoot()+"/Modules/CMake.cmake.ctest")
|
||||
+ )
|
||||
+ )
|
||||
+ {
|
||||
// couldn't find modules
|
||||
cmSystemTools::Error(
|
||||
"Could not find CMAKE_ROOT !!!\n"
|
||||
--
|
||||
2.20.1
|
||||
|
||||
|
|
@ -1,32 +0,0 @@
|
|||
From 92c4b3d900a24512967a960f108d985c819fdf00 Mon Sep 17 00:00:00 2001
|
||||
From: Raphael Kubo da Costa <rakuco@FreeBSD.org>
|
||||
Date: Sat, 23 Jun 2018 20:30:07 +0200
|
||||
Subject: [PATCH] FindLibUV: Also check uv/version.h for version detection
|
||||
|
||||
Starting with libuv 1.21.0, libuv's headers were moved into a uv/ directory.
|
||||
Make FindLibUV aware of the file's new location for configuration to work.
|
||||
|
||||
Upstream change: https://github.com/libuv/libuv/pull/1429
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Retrieve from: https://gitlab.kitware.com/cmake/cmake/merge_requests/2169]
|
||||
---
|
||||
Source/Modules/FindLibUV.cmake | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/Source/Modules/FindLibUV.cmake b/Source/Modules/FindLibUV.cmake
|
||||
index ba13d75f8b..0554d62c23 100644
|
||||
--- a/Source/Modules/FindLibUV.cmake
|
||||
+++ b/Source/Modules/FindLibUV.cmake
|
||||
@@ -63,6 +63,8 @@ mark_as_advanced(LibUV_INCLUDE_DIR)
|
||||
set(_LibUV_H_REGEX "#[ \t]*define[ \t]+UV_VERSION_(MAJOR|MINOR|PATCH)[ \t]+[0-9]+")
|
||||
if(LibUV_INCLUDE_DIR AND EXISTS "${LibUV_INCLUDE_DIR}/uv-version.h")
|
||||
file(STRINGS "${LibUV_INCLUDE_DIR}/uv-version.h" _LibUV_H REGEX "${_LibUV_H_REGEX}")
|
||||
+elseif(LibUV_INCLUDE_DIR AND EXISTS "${LibUV_INCLUDE_DIR}/uv/version.h")
|
||||
+ file(STRINGS "${LibUV_INCLUDE_DIR}/uv/version.h" _LibUV_H REGEX "${_LibUV_H_REGEX}")
|
||||
elseif(LibUV_INCLUDE_DIR AND EXISTS "${LibUV_INCLUDE_DIR}/uv.h")
|
||||
file(STRINGS "${LibUV_INCLUDE_DIR}/uv.h" _LibUV_H REGEX "${_LibUV_H_REGEX}")
|
||||
else()
|
||||
--
|
||||
2.16.4
|
||||
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
# From https://cmake.org/files/v3.9/cmake-3.9.6-SHA-256.txt
|
||||
sha256 7410851a783a41b521214ad987bb534a7e4a65e059651a2514e6ebfc8f46b218 cmake-3.9.6.tar.gz
|
||||
# From https://cmake.org/files/v3.15/cmake-3.15.4-SHA-256.txt
|
||||
sha256 8a211589ea21374e49b25fc1fc170e2d5c7462b795f1b29c84dd0e984301ed7a cmake-3.15.4.tar.gz
|
||||
|
||||
# Locally calculated
|
||||
sha256 9d8604f7afc5564ceb9705ba121f5fba2782ce18d92902f3c6ed338228372170 Copyright.txt
|
||||
sha256 dc628fb936a5d229296d42083f9a8218aa32204c016919e784404c9ec58776e9 Copyright.txt
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
#
|
||||
################################################################################
|
||||
|
||||
CMAKE_VERSION_MAJOR = 3.9
|
||||
CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).6
|
||||
CMAKE_VERSION_MAJOR = 3.15
|
||||
CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).4
|
||||
CMAKE_SITE = https://cmake.org/files/v$(CMAKE_VERSION_MAJOR)
|
||||
CMAKE_LICENSE = BSD-3-Clause
|
||||
CMAKE_LICENSE_FILES = Copyright.txt
|
||||
|
|
|
|||
Loading…
Reference in New Issue