[vlc-commits] tools: update CMake to 3.17.0

[Steve Lhomme]

vlc/vlc-3.0 | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Wed Mar 25 13:39:17 2020 +0100| [4c07f88a3377be489a247868ec116449a340dcc9] | committer: Steve Lhomme

tools: update CMake to 3.17.0

It includes the patch from Hugo to fix the PKG_CONFIG_PATH usage.

(cherry picked from commit 9f33c286ccfec41ccc494c862311c19b9a905c2f)

Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=4c07f88a3377be489a247868ec116449a340dcc9
---

 ...ig-Fix-path-manipulations-when-cross-comp.patch | 28 ----------------------
 extras/tools/SHA512SUMS                            |  2 +-
 extras/tools/bootstrap                             |  2 +-
 extras/tools/packages.mak                          |  4 ++--
 extras/tools/tools.mak                             |  3 +--
 5 files changed, 5 insertions(+), 34 deletions(-)

diff --git a/extras/tools/0001-FindPkgConfig-Fix-path-manipulations-when-cross-comp.patch b/extras/tools/0001-FindPkgConfig-Fix-path-manipulations-when-cross-comp.patch
deleted file mode 100644
index 3b5e765661..0000000000
--- a/extras/tools/0001-FindPkgConfig-Fix-path-manipulations-when-cross-comp.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From f92a4b23994fa7516f16fbb5b3c02caa07534b3f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo at beauzee.fr>
-Date: Mon, 2 Dec 2019 16:42:07 +0100
-Subject: [PATCH] FindPkgConfig: Fix path manipulations when cross compiling
-
-When cross compiling from a unix machine, if(UNIX) is false,
-whih causes the path not to be fixed for unix, leading to false
-negative if PKG_CONFIG_PATH needs to be probed
----
- Modules/FindPkgConfig.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake
-index 5162a44b33..f4b6ea121c 100644
---- a/Modules/FindPkgConfig.cmake
-+++ b/Modules/FindPkgConfig.cmake
-@@ -337,7 +337,7 @@ macro(_pkg_set_path_internal)
-       # remove empty values from the list
-       list(REMOVE_ITEM _pkgconfig_path "")
-       file(TO_NATIVE_PATH "${_pkgconfig_path}" _pkgconfig_path)
--      if(UNIX)
-+      if(CMAKE_HOST_UNIX)
-         string(REPLACE ";" ":" _pkgconfig_path "${_pkgconfig_path}")
-         string(REPLACE "\\ " " " _pkgconfig_path "${_pkgconfig_path}")
-       endif()
--- 
-2.19.1.windows.1
-
diff --git a/extras/tools/SHA512SUMS b/extras/tools/SHA512SUMS
index 2cf661b9fa..f5d893345e 100644
--- a/extras/tools/SHA512SUMS
+++ b/extras/tools/SHA512SUMS
@@ -1,7 +1,7 @@
 3954a6ad3f522c135f327ba0d376eb16ae42103849c8cc5cd6c8c6e87b8c5433c95a0f2d4dfa3e6c2705ee0b8996e5b27d0b2248f64a05fc8c902116cc45a7b2  apache-ant-1.9.7.tar.bz2
 e34c7818bcde14d2cb13cdd293ed17d70740d4d1fd7c67a07b415491ef85d42f450d4fe5f8f80cc330bf75c40a62774c51a4336e06e8da07a4cbc49922d975ee  autoconf-2.69.tar.gz
 47b0120a59e3e020529a6ce750297d7de1156fd2be38db5d101e50120f11b40c28741ecd5eacf2790a9e25386713dcf7717339cfa5d7943d0dbf47c417383448  automake-1.16.1.tar.gz
-b5e68083713462400b38424bf1dbfe73d37a5fbe211fadac30c576246024a1d40f95fab7044804b7201a1bc2e7fd5b7093257e9534cd35538c8b274dc00f4b76  cmake-3.16.2.tar.gz
+f09440681e0c414f5ca669f3aeba6666d09e0642f30a2e12c3199e7fb3da95a7dd17994fc54475c49638c37f0502ea0a2d8da0f9098805f11088ba7b299bf72a  cmake-3.17.0.tar.gz
 9953413376c6b33e9e49d1f4f5b2d50075e0b1defb17b3c233d186d21416e6b607df11f6030588eeec3b025e1075c9c37a3db3c872fc22329d1dc0d0c6e2d9d0  gas-preprocessor-72887b9.tar.gz
 3233d81cb2739a54b840a0a82064eebbfaa4fb442fb993a35d6bd41d8395c51f038c90ae048b9252f172d0a5bbfb4b36e2b13d4477001f9ff7d4124237819a18  libtool-2.4.6.tar.gz
 29254dd4267a093e8d9da3a26df8b02564044cdb4506be539ec1aff4e5d406477bcf32f5e813c840f3aec77293bfe2cdde18f6a21724a7e0bfff646ec88b74ae  m4-1.4.18.tar.gz
diff --git a/extras/tools/bootstrap b/extras/tools/bootstrap
index b11c9d85ea..28a99428dd 100755
--- a/extras/tools/bootstrap
+++ b/extras/tools/bootstrap
@@ -133,7 +133,7 @@ check automake 1.15
 check m4 1.4.16
 check libtool 2.4
 check pkg-config
-check cmake 3.16.0
+check cmake 3.17.0
 check yasm
 check_tar
 check ragel
diff --git a/extras/tools/packages.mak b/extras/tools/packages.mak
index 3c4dd372bd..04c9957c4e 100644
--- a/extras/tools/packages.mak
+++ b/extras/tools/packages.mak
@@ -9,8 +9,8 @@ YASM_URL=http://www.tortall.net/projects/yasm/releases/yasm-$(YASM_VERSION).tar.
 NASM_VERSION=2.14
 NASM_URL=http://www.nasm.us/pub/nasm/releasebuilds/$(NASM_VERSION)/nasm-$(NASM_VERSION).tar.gz
 
-CMAKE_VERSION=3.16.2
-CMAKE_URL=http://www.cmake.org/files/v3.16/cmake-$(CMAKE_VERSION).tar.gz
+CMAKE_VERSION=3.17.0
+CMAKE_URL=http://www.cmake.org/files/v3.17/cmake-$(CMAKE_VERSION).tar.gz
 
 LIBTOOL_VERSION=2.4.6
 LIBTOOL_URL=$(GNU)/libtool/libtool-$(LIBTOOL_VERSION).tar.gz
diff --git a/extras/tools/tools.mak b/extras/tools/tools.mak
index 26f7ac9a89..f3dffac474 100644
--- a/extras/tools/tools.mak
+++ b/extras/tools/tools.mak
@@ -92,12 +92,11 @@ cmake-$(CMAKE_VERSION).tar.gz:
 
 cmake: cmake-$(CMAKE_VERSION).tar.gz
 	$(UNPACK)
-	$(APPLY) $(TOOLS)/0001-FindPkgConfig-Fix-path-manipulations-when-cross-comp.patch
 	$(APPLY) $(TOOLS)/cmake-msys-FindPkg.patch
 	$(MOVE)
 
 .buildcmake: cmake
-	(cd $<; ./configure --prefix=$(PREFIX) $(CMAKEFLAGS) --no-qt-gui -- -DCMAKE_USE_OPENSSL:BOOL=OFF && $(MAKE) && $(MAKE) install)
+	(cd $<; ./configure --prefix=$(PREFIX) $(CMAKEFLAGS) --no-qt-gui -- -DCMAKE_USE_OPENSSL:BOOL=OFF -DBUILD_TESTING:BOOL=OFF && $(MAKE) && $(MAKE) install)
 	touch $@
 
 CLEAN_FILE += .buildcmake