tools/cmake: update to 3.10.1

Update cmake to 3.10.1
Refresh patches

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

6 files changed, 13 insertions, 37 deletions

diff --git a/tools/cmake/patches/010-backport-macos-fix.patch b/tools/cmake/patches/010-backport-macos-fix.patch
deleted file mode 100644
index 76e92dcb0e..0000000000
--- a/tools/cmake/patches/010-backport-macos-fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/Source/kwsys/kwsysPlatformTestsCXX.cxx
-+++ b/Source/kwsys/kwsysPlatformTestsCXX.cxx
-@@ -265,6 +265,12 @@ int main()
- #ifdef TEST_KWSYS_CXX_HAS_UTIMENSAT
- #include <fcntl.h>
- #include <sys/stat.h>
-+#if defined(__APPLE__)
-+#include <AvailabilityMacros.h>
-+#if MAC_OS_X_VERSION_MIN_REQUIRED < 101300
-+#error "utimensat not available on macOS < 10.13"
-+#endif
-+#endif
- int main()
- {
-   struct timespec times[2] = { { 0, UTIME_OMIT }, { 0, UTIME_NOW } };
diff --git a/tools/cmake/patches/100-disable_qt_tests.patch b/tools/cmake/patches/100-disable_qt_tests.patch
index f8baafe333..6e8307dea4 100644
--- a/tools/cmake/patches/100-disable_qt_tests.patch
+++ b/tools/cmake/patches/100-disable_qt_tests.patch
@@ -1,6 +1,6 @@
 --- a/Tests/RunCMake/CMakeLists.txt
 +++ b/Tests/RunCMake/CMakeLists.txt
-@@ -246,15 +246,6 @@ add_RunCMake_test(no_install_prefix)
+@@ -273,15 +273,6 @@ add_RunCMake_test(no_install_prefix)
  add_RunCMake_test(configure_file)
  add_RunCMake_test(CTestTimeoutAfterMatch)
  
@@ -18,14 +18,17 @@
    add_RunCMake_test(FindPkgConfig)
 --- a/Tests/CMakeLists.txt
 +++ b/Tests/CMakeLists.txt
-@@ -403,10 +403,6 @@ if(BUILD_TESTING)
+@@ -407,13 +407,6 @@ if(BUILD_TESTING)
  
    list(APPEND TEST_BUILD_DIRS ${CMake_TEST_INSTALL_PREFIX})
  
--  if(NOT QT4_FOUND)
+-  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(QT4_FOUND)
+   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"
diff --git a/tools/cmake/patches/110-alpine_musl-compat.patch b/tools/cmake/patches/110-alpine_musl-compat.patch
index ae93201e53..a2c84fca4a 100644
--- a/tools/cmake/patches/110-alpine_musl-compat.patch
+++ b/tools/cmake/patches/110-alpine_musl-compat.patch
@@ -1,6 +1,6 @@
 --- a/Utilities/cmjsoncpp/include/json/assertions.h
 +++ b/Utilities/cmjsoncpp/include/json/assertions.h
-@@ -6,12 +6,12 @@
+@@ -6,11 +6,12 @@
  #ifndef CPPTL_JSON_ASSERTIONS_H_INCLUDED
  #define CPPTL_JSON_ASSERTIONS_H_INCLUDED
  
@@ -11,7 +11,6 @@
  #endif // if !defined(JSON_IS_AMALGAMATION)
  
 -#include <stdlib.h>
--
- #if JSON_USE_EXCEPTION
- #include <stdexcept>
- #define JSON_ASSERT(condition)                                                 \
+ #include <sstream>
+ 
+ /** It should not be possible for a maliciously designed file to
diff --git a/tools/cmake/patches/120-libarchive-fix-libressl-compat.patch b/tools/cmake/patches/120-libarchive-fix-libressl-compat.patch
index a56ac2ed0c..ba6565b6af 100644
--- a/tools/cmake/patches/120-libarchive-fix-libressl-compat.patch
+++ b/tools/cmake/patches/120-libarchive-fix-libressl-compat.patch
@@ -9,14 +9,3 @@
  #include <stdlib.h> /* malloc, free */
  #include <string.h> /* memset */
  static inline EVP_MD_CTX *EVP_MD_CTX_new(void)
---- a/Utilities/cmlibarchive/libarchive/archive_openssl_hmac_private.h
-+++ b/Utilities/cmlibarchive/libarchive/archive_openssl_hmac_private.h
-@@ -28,7 +28,7 @@
- #include <openssl/hmac.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 HMAC_CTX *HMAC_CTX_new(void)
diff --git a/tools/cmake/patches/130-curl-fix-libressl-linking.patch b/tools/cmake/patches/130-curl-fix-libressl-linking.patch
index b5ee61b58a..ad5b89750e 100644
--- a/tools/cmake/patches/130-curl-fix-libressl-linking.patch
+++ b/tools/cmake/patches/130-curl-fix-libressl-linking.patch
@@ -20,7 +20,7 @@ Signed-off-by: Jo-Philipp Wich <jo@mein.io>
 ---
 --- a/Utilities/cmcurl/CMakeLists.txt
 +++ b/Utilities/cmcurl/CMakeLists.txt
-@@ -456,6 +456,10 @@ if(CMAKE_USE_OPENSSL)
+@@ -461,6 +461,10 @@ if(CMAKE_USE_OPENSSL)
    set(USE_OPENSSL ON)
    set(HAVE_LIBCRYPTO ON)
    set(HAVE_LIBSSL ON)
diff --git a/tools/cmake/patches/140-bootstrap_parallel_make_flag.patch b/tools/cmake/patches/140-bootstrap_parallel_make_flag.patch
index 734e8cb1cc..a3cdefbb16 100644
--- a/tools/cmake/patches/140-bootstrap_parallel_make_flag.patch
+++ b/tools/cmake/patches/140-bootstrap_parallel_make_flag.patch
@@ -1,6 +1,6 @@
 --- a/bootstrap
 +++ b/bootstrap
-@@ -1094,7 +1094,10 @@ int main(){ printf("1%c", (char)0x0a); r
+@@ -1130,7 +1130,10 @@ int main(){ printf("1%c", (char)0x0a); r
  ' > "test.c"
  cmake_original_make_flags="${cmake_make_flags}"
  if [ "x${cmake_parallel_make}" != "x" ]; then