[vlc-devel] [PATCH 3.0 5/6] extras/tools: Bump built cmake version to 3.13.x

[Steve Lhomme]

From: Hugo Beauzée-Luyssen <hugo at beauzee.fr>

This version now contains the patch required for windows store build
using llvm.

(cherry picked from commit 8eb7a0d0be06f856ab6a5a015ced8ea5d4fadf96) (edited)

edited:
- this branch was already using cmake 3.13 but the winstore patch wasn't removed

Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>
---
 extras/tools/cmake-winstore.patch | 89 -------------------------------
 extras/tools/tools.mak            |  1 -
 2 files changed, 90 deletions(-)
 delete mode 100644 extras/tools/cmake-winstore.patch

diff --git a/extras/tools/cmake-winstore.patch b/extras/tools/cmake-winstore.patch
deleted file mode 100644
index 1f363f4216..0000000000
--- a/extras/tools/cmake-winstore.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From de5a4653d73aa601af9d08c91d4de2e09c430c1e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin at martin.st>
-Date: Sun, 1 Jul 2018 23:16:00 +0300
-Subject: [PATCH] Add WindowsPhone and WindowsStore platform modules for
- Clang/GNU C/CXX
-
-Just like the existing WindowsPhone and WindowsStore platform modules
-for MSVC, just include the corresponding Windows platform modules.
-
-MinGW tools (both with GCC and Clang) can be used for building for
-Windows Store, even though it isn't a very common or simple setup.
----
- Modules/Platform/WindowsPhone-Clang-C.cmake   | 1 +
- Modules/Platform/WindowsPhone-Clang-CXX.cmake | 1 +
- Modules/Platform/WindowsPhone-GNU-C.cmake     | 1 +
- Modules/Platform/WindowsPhone-GNU-CXX.cmake   | 1 +
- Modules/Platform/WindowsStore-Clang-C.cmake   | 1 +
- Modules/Platform/WindowsStore-Clang-CXX.cmake | 1 +
- Modules/Platform/WindowsStore-GNU-C.cmake     | 1 +
- Modules/Platform/WindowsStore-GNU-CXX.cmake   | 1 +
- 8 files changed, 8 insertions(+)
- create mode 100644 Modules/Platform/WindowsPhone-Clang-C.cmake
- create mode 100644 Modules/Platform/WindowsPhone-Clang-CXX.cmake
- create mode 100644 Modules/Platform/WindowsPhone-GNU-C.cmake
- create mode 100644 Modules/Platform/WindowsPhone-GNU-CXX.cmake
- create mode 100644 Modules/Platform/WindowsStore-Clang-C.cmake
- create mode 100644 Modules/Platform/WindowsStore-Clang-CXX.cmake
- create mode 100644 Modules/Platform/WindowsStore-GNU-C.cmake
- create mode 100644 Modules/Platform/WindowsStore-GNU-CXX.cmake
-
-diff --git a/Modules/Platform/WindowsPhone-Clang-C.cmake b/Modules/Platform/WindowsPhone-Clang-C.cmake
-new file mode 100644
-index 000000000..6e38572cd
---- /dev/null
-+++ b/Modules/Platform/WindowsPhone-Clang-C.cmake
-@@ -0,0 +1 @@
-+include(Platform/Windows-Clang-C)
-diff --git a/Modules/Platform/WindowsPhone-Clang-CXX.cmake b/Modules/Platform/WindowsPhone-Clang-CXX.cmake
-new file mode 100644
-index 000000000..bf47978c4
---- /dev/null
-+++ b/Modules/Platform/WindowsPhone-Clang-CXX.cmake
-@@ -0,0 +1 @@
-+include(Platform/Windows-Clang-CXX)
-diff --git a/Modules/Platform/WindowsPhone-GNU-C.cmake b/Modules/Platform/WindowsPhone-GNU-C.cmake
-new file mode 100644
-index 000000000..ff6acd56d
---- /dev/null
-+++ b/Modules/Platform/WindowsPhone-GNU-C.cmake
-@@ -0,0 +1 @@
-+include(Platform/Windows-GNU-C)
-diff --git a/Modules/Platform/WindowsPhone-GNU-CXX.cmake b/Modules/Platform/WindowsPhone-GNU-CXX.cmake
-new file mode 100644
-index 000000000..6adab6af3
---- /dev/null
-+++ b/Modules/Platform/WindowsPhone-GNU-CXX.cmake
-@@ -0,0 +1 @@
-+include(Platform/Windows-GNU-CXX)
-diff --git a/Modules/Platform/WindowsStore-Clang-C.cmake b/Modules/Platform/WindowsStore-Clang-C.cmake
-new file mode 100644
-index 000000000..6e38572cd
---- /dev/null
-+++ b/Modules/Platform/WindowsStore-Clang-C.cmake
-@@ -0,0 +1 @@
-+include(Platform/Windows-Clang-C)
-diff --git a/Modules/Platform/WindowsStore-Clang-CXX.cmake b/Modules/Platform/WindowsStore-Clang-CXX.cmake
-new file mode 100644
-index 000000000..bf47978c4
---- /dev/null
-+++ b/Modules/Platform/WindowsStore-Clang-CXX.cmake
-@@ -0,0 +1 @@
-+include(Platform/Windows-Clang-CXX)
-diff --git a/Modules/Platform/WindowsStore-GNU-C.cmake b/Modules/Platform/WindowsStore-GNU-C.cmake
-new file mode 100644
-index 000000000..ff6acd56d
---- /dev/null
-+++ b/Modules/Platform/WindowsStore-GNU-C.cmake
-@@ -0,0 +1 @@
-+include(Platform/Windows-GNU-C)
-diff --git a/Modules/Platform/WindowsStore-GNU-CXX.cmake b/Modules/Platform/WindowsStore-GNU-CXX.cmake
-new file mode 100644
-index 000000000..6adab6af3
---- /dev/null
-+++ b/Modules/Platform/WindowsStore-GNU-CXX.cmake
-@@ -0,0 +1 @@
-+include(Platform/Windows-GNU-CXX)
--- 
-2.15.2 (Apple Git-101.1)
-
diff --git a/extras/tools/tools.mak b/extras/tools/tools.mak
index a941edf264..0fc3f5fdcf 100644
--- a/extras/tools/tools.mak
+++ b/extras/tools/tools.mak
@@ -85,7 +85,6 @@ cmake-$(CMAKE_VERSION).tar.gz:
 cmake: cmake-$(CMAKE_VERSION).tar.gz
 	$(UNPACK)
 	$(APPLY) cmake-msys-FindPkg.patch
-	$(APPLY) cmake-winstore.patch
 	$(MOVE)
 
 .cmake: cmake
-- 
2.26.2