tools/cmake: update to 3.17.0
Remove libressl patches; they are no longer needed as LibreSSl adde support Replace qt tests patch with one that disables all of them. Refresh remaining one. Signed-off-by: Rosen Penev <rosenp@gmail.com>master
parent
a0d1451088
commit
8af80e79bd
@ -1,34 +0,0 @@
|
|||||||
--- a/Tests/RunCMake/CMakeLists.txt
|
|
||||||
+++ b/Tests/RunCMake/CMakeLists.txt
|
|
||||||
@@ -375,15 +375,6 @@ else()
|
|
||||||
message(WARNING "Could not find or build ctresalloc")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
-find_package(Qt4 QUIET)
|
|
||||||
-find_package(Qt5Core QUIET)
|
|
||||||
-if (QT4_FOUND AND Qt5Core_FOUND AND NOT Qt5Core_VERSION VERSION_LESS 5.1.0)
|
|
||||||
- add_RunCMake_test(IncompatibleQt)
|
|
||||||
-endif()
|
|
||||||
-if (QT4_FOUND)
|
|
||||||
- add_RunCMake_test(ObsoleteQtMacros -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE})
|
|
||||||
-endif()
|
|
||||||
-
|
|
||||||
find_package(PkgConfig QUIET)
|
|
||||||
if(PKG_CONFIG_FOUND)
|
|
||||||
add_RunCMake_test(FindPkgConfig)
|
|
||||||
--- a/Tests/CMakeLists.txt
|
|
||||||
+++ b/Tests/CMakeLists.txt
|
|
||||||
@@ -489,13 +489,6 @@ if(BUILD_TESTING)
|
|
||||||
|
|
||||||
list(APPEND TEST_BUILD_DIRS ${CMake_TEST_INSTALL_PREFIX})
|
|
||||||
|
|
||||||
- if(NOT DEFINED CMake_TEST_Qt4)
|
|
||||||
- set(CMake_TEST_Qt4 1)
|
|
||||||
- endif()
|
|
||||||
- if(CMake_TEST_Qt4 AND NOT QT4_FOUND)
|
|
||||||
- find_package(Qt4 QUIET)
|
|
||||||
- endif()
|
|
||||||
-
|
|
||||||
if(CMake_TEST_Qt4 AND QT4_FOUND)
|
|
||||||
# test whether the Qt4 which has been found works, on some machines
|
|
||||||
# which run nightly builds there were errors like "wrong file format"
|
|
@ -0,0 +1,33 @@
|
|||||||
|
--- a/Modules/CTest.cmake
|
||||||
|
+++ b/Modules/CTest.cmake
|
||||||
|
@@ -47,7 +47,7 @@ the :variable:`CTEST_USE_LAUNCHERS` variable::
|
||||||
|
in the ``CTestConfig.cmake`` file.
|
||||||
|
#]=======================================================================]
|
||||||
|
|
||||||
|
-option(BUILD_TESTING "Build the testing tree." ON)
|
||||||
|
+option(BUILD_TESTING "Build the testing tree." OFF)
|
||||||
|
|
||||||
|
# function to turn generator name into a version string
|
||||||
|
# like vs9 or vs10
|
||||||
|
--- a/Modules/Dart.cmake
|
||||||
|
+++ b/Modules/Dart.cmake
|
||||||
|
@@ -33,7 +33,7 @@ whether testing support should be enabled. The default is ON.
|
||||||
|
#
|
||||||
|
#
|
||||||
|
|
||||||
|
-option(BUILD_TESTING "Build the testing tree." ON)
|
||||||
|
+option(BUILD_TESTING "Build the testing tree." OFF)
|
||||||
|
|
||||||
|
if(BUILD_TESTING)
|
||||||
|
find_package(Dart QUIET)
|
||||||
|
--- a/Tests/Contracts/VTK/Dashboard.cmake.in
|
||||||
|
+++ b/Tests/Contracts/VTK/Dashboard.cmake.in
|
||||||
|
@@ -25,7 +25,7 @@ ctest_empty_binary_directory(${CTEST_BINARY_DIRECTORY})
|
||||||
|
|
||||||
|
file(WRITE "${CTEST_BINARY_DIRECTORY}/CMakeCache.txt" "
|
||||||
|
BUILD_EXAMPLES:BOOL=ON
|
||||||
|
- BUILD_TESTING:BOOL=ON
|
||||||
|
+ BUILD_TESTING:BOOL=OFF
|
||||||
|
VTK_WRAP_PYTHON:BOOL=ON
|
||||||
|
ExternalData_OBJECT_STORES:FILEPATH=@base_dir@/ExternalData
|
||||||
|
")
|
@ -1,11 +0,0 @@
|
|||||||
--- a/Utilities/cmlibarchive/libarchive/archive_openssl_evp_private.h
|
|
||||||
+++ b/Utilities/cmlibarchive/libarchive/archive_openssl_evp_private.h
|
|
||||||
@@ -28,7 +28,7 @@
|
|
||||||
#include <openssl/evp.h>
|
|
||||||
#include <openssl/opensslv.h>
|
|
||||||
|
|
||||||
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
|
||||||
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
|
|
||||||
#include <stdlib.h> /* malloc, free */
|
|
||||||
#include <string.h> /* memset */
|
|
||||||
static inline EVP_MD_CTX *EVP_MD_CTX_new(void)
|
|
@ -1,25 +0,0 @@
|
|||||||
From 5da00ad75b09e262774ec3675bbe4d5a4502a852 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Bernard Spil <brnrd@FreeBSD.org>
|
|
||||||
Date: Sun, 1 Apr 2018 23:01:44 +0200
|
|
||||||
Subject: [PATCH] fix build with LibreSSL 2.7
|
|
||||||
|
|
||||||
LibreSSL 2.7 adds OpenSSL 1.1 API leading to conflicts on method names
|
|
||||||
|
|
||||||
See also: https://bugs.freebsd.org/226853
|
|
||||||
Signed-off-by: Bernard Spil <brnrd@FreeBSD.org>
|
|
||||||
---
|
|
||||||
libarchive/archive_openssl_hmac_private.h | 3 ++-
|
|
||||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
--- a/Utilities/cmlibarchive/libarchive/archive_openssl_evp_private.h
|
|
||||||
+++ b/Utilities/cmlibarchive/libarchive/archive_openssl_evp_private.h
|
|
||||||
@@ -28,7 +28,8 @@
|
|
||||||
#include <openssl/evp.h>
|
|
||||||
#include <openssl/opensslv.h>
|
|
||||||
|
|
||||||
-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
|
|
||||||
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
|
|
||||||
+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
|
|
||||||
#include <stdlib.h> /* malloc, free */
|
|
||||||
#include <string.h> /* memset */
|
|
||||||
static inline EVP_MD_CTX *EVP_MD_CTX_new(void)
|
|
Loading…
Reference in New Issue