diff --git a/c17-default.patch b/c17-default.patch
index c45c18f..36c7607 100644
--- a/c17-default.patch
+++ b/c17-default.patch
@@ -1,8 +1,8 @@
-Index: cmake-3.10.2/Modules/CMakeCCompilerId.c.in
+Index: b/Modules/CMakeCCompilerId.c.in
 ===================================================================
---- cmake-3.10.2.orig/Modules/CMakeCCompilerId.c.in
-+++ cmake-3.10.2/Modules/CMakeCCompilerId.c.in
-@@ -39,6 +39,8 @@ char const *info_cray = "INFO" ":" "comp
+--- a/Modules/CMakeCCompilerId.c.in
++++ b/Modules/CMakeCCompilerId.c.in
+@@ -40,6 +40,8 @@ char const *info_cray = "INFO" ":" "comp
  # else
  #  define C_DIALECT
  # endif
@@ -11,21 +11,21 @@ Index: cmake-3.10.2/Modules/CMakeCCompilerId.c.in
  #elif __STDC_VERSION__ >= 201000L
  # define C_DIALECT "11"
  #elif __STDC_VERSION__ >= 199901L
-Index: cmake-3.10.2/Modules/Compiler/GNU-C.cmake
+Index: b/Modules/Compiler/GNU-C.cmake
 ===================================================================
---- cmake-3.10.2.orig/Modules/Compiler/GNU-C.cmake
-+++ cmake-3.10.2/Modules/Compiler/GNU-C.cmake
+--- a/Modules/Compiler/GNU-C.cmake
++++ b/Modules/Compiler/GNU-C.cmake
 @@ -22,4 +22,4 @@ elseif (NOT CMAKE_C_COMPILER_VERSION VER
    set(CMAKE_C11_EXTENSION_COMPILE_OPTION "-std=gnu1x")
  endif()
  
 -__compiler_check_default_language_standard(C 3.4 90 5.0 11)
 +__compiler_check_default_language_standard(C 3.4 90 5.0 11 8.0 17)
-Index: cmake-3.10.2/Source/cmLocalGenerator.cxx
+Index: b/Source/cmLocalGenerator.cxx
 ===================================================================
---- cmake-3.10.2.orig/Source/cmLocalGenerator.cxx
-+++ cmake-3.10.2/Source/cmLocalGenerator.cxx
-@@ -1575,6 +1575,7 @@ void cmLocalGenerator::AddCompilerRequir
+--- a/Source/cmLocalGenerator.cxx
++++ b/Source/cmLocalGenerator.cxx
+@@ -1566,6 +1566,7 @@ void cmLocalGenerator::AddCompilerRequir
      langStdMap["CXX"].push_back("11");
      langStdMap["CXX"].push_back("98");
  
@@ -33,11 +33,11 @@ Index: cmake-3.10.2/Source/cmLocalGenerator.cxx
      langStdMap["C"].push_back("11");
      langStdMap["C"].push_back("99");
      langStdMap["C"].push_back("90");
-Index: cmake-3.10.2/Source/cmMakefile.cxx
+Index: b/Source/cmMakefile.cxx
 ===================================================================
---- cmake-3.10.2.orig/Source/cmMakefile.cxx
-+++ cmake-3.10.2/Source/cmMakefile.cxx
-@@ -4077,7 +4077,7 @@ static const char* const CXX_FEATURES[]
+--- a/Source/cmMakefile.cxx
++++ b/Source/cmMakefile.cxx
+@@ -4161,7 +4161,7 @@ static const char* const CXX_FEATURES[]
    FEATURE_STRING) };
  #undef FEATURE_STRING
  
@@ -46,10 +46,10 @@ Index: cmake-3.10.2/Source/cmMakefile.cxx
  static const char* const CXX_STANDARDS[] = { "98", "11", "14", "17" };
  
  bool cmMakefile::AddRequiredTargetFeature(cmTarget* target,
-Index: cmake-3.10.2/Tests/CompileFeatures/CMakeLists.txt
+Index: b/Tests/CompileFeatures/CMakeLists.txt
 ===================================================================
---- cmake-3.10.2.orig/Tests/CompileFeatures/CMakeLists.txt
-+++ cmake-3.10.2/Tests/CompileFeatures/CMakeLists.txt
+--- a/Tests/CompileFeatures/CMakeLists.txt
++++ b/Tests/CompileFeatures/CMakeLists.txt
 @@ -214,6 +214,7 @@ if (C_expected_features)
      if (std_flag_idx EQUAL -1)
        add_executable(default_dialect_C default_dialect.c)
@@ -58,18 +58,18 @@ Index: cmake-3.10.2/Tests/CompileFeatures/CMakeLists.txt
          DEFAULT_C11=$<EQUAL:${CMAKE_C_STANDARD_DEFAULT},11>
          DEFAULT_C99=$<EQUAL:${CMAKE_C_STANDARD_DEFAULT},99>
          DEFAULT_C90=$<EQUAL:${CMAKE_C_STANDARD_DEFAULT},90>
-Index: cmake-3.10.2/Tests/CompileFeatures/default_dialect.c
+Index: b/Tests/CompileFeatures/default_dialect.c
 ===================================================================
---- cmake-3.10.2.orig/Tests/CompileFeatures/default_dialect.c
-+++ cmake-3.10.2/Tests/CompileFeatures/default_dialect.c
+--- a/Tests/CompileFeatures/default_dialect.c
++++ b/Tests/CompileFeatures/default_dialect.c
 @@ -1,5 +1,9 @@
  
 -#if DEFAULT_C11
 +#if DEFAULT_C17
-+#if __STDC_VERSION__ != 201710L
++#if __STDC_VERSION__ < 201710L
 +#error Unexpected value for __STDC_VERSION__.
 +#endif
 +#elif DEFAULT_C11
- #if __STDC_VERSION__ != 201112L
+ #if __STDC_VERSION__ < 201112L
  #error Unexpected value for __STDC_VERSION__.
  #endif
diff --git a/cmake-3.10.1_boost-1.66.patch b/cmake-3.10.1_boost-1.66.patch
deleted file mode 100644
index ce065c8..0000000
--- a/cmake-3.10.1_boost-1.66.patch
+++ /dev/null
@@ -1,237 +0,0 @@
-diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
-index 88d14ab..5db15a5 100644
---- a/Modules/FindBoost.cmake
-+++ b/Modules/FindBoost.cmake
-@@ -797,9 +797,8 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret)
-       set(_Boost_WAVE_DEPENDENCIES filesystem system serialization thread chrono date_time atomic)
-       set(_Boost_WSERIALIZATION_DEPENDENCIES serialization)
-     endif()
--    if(NOT Boost_VERSION VERSION_LESS 106600)
-+    if(NOT Boost_VERSION VERSION_LESS 106700)
-       message(WARNING "New Boost version may have incorrect or missing dependencies and imported targets")
--      set(_Boost_IMPORTED_TARGETS FALSE)
-     endif()
-   endif()
- 
-@@ -831,8 +830,8 @@ function(_Boost_COMPONENT_HEADERS component _hdrs)
-   set(_Boost_CONTAINER_HEADERS           "boost/container/container_fwd.hpp")
-   set(_Boost_CONTEXT_HEADERS             "boost/context/all.hpp")
-   set(_Boost_COROUTINE_HEADERS           "boost/coroutine/all.hpp")
--  set(_Boost_EXCEPTION_HEADERS           "boost/exception/exception.hpp")
-   set(_Boost_DATE_TIME_HEADERS           "boost/date_time/date.hpp")
-+  set(_Boost_EXCEPTION_HEADERS           "boost/exception/exception.hpp")
-   set(_Boost_FIBER_HEADERS               "boost/fiber/all.hpp")
-   set(_Boost_FILESYSTEM_HEADERS          "boost/filesystem/path.hpp")
-   set(_Boost_GRAPH_HEADERS               "boost/graph/adjacency_list.hpp")
-@@ -931,8 +930,8 @@ endfunction()
- # `${Boost_ROOT}/libs/fiber/build/Jamfile.v2`.
- #
- function(_Boost_COMPILER_FEATURES component _ret)
--  # Boost >= 1.62 and < 1.65
--  if(NOT Boost_VERSION VERSION_LESS 106200 AND Boost_VERSION VERSION_LESS 106500)
-+  # Boost >= 1.62 and < 1.67
-+  if(NOT Boost_VERSION VERSION_LESS 106200 AND Boost_VERSION VERSION_LESS 106700)
-     set(_Boost_FIBER_COMPILER_FEATURES
-         cxx_alias_templates
-         cxx_auto_type
-@@ -951,6 +950,13 @@ function(_Boost_COMPILER_FEATURES component _ret)
-   set(${_ret} ${_Boost_${uppercomponent}_COMPILER_FEATURES} PARENT_SCOPE)
- endfunction()
- 
-+# Architecture name will be useful for finding library names starting 1.66.0
-+if(CMAKE_SIZEOF_VOID_P EQUAL 8)
-+  set(_arch_suffix 64)
-+else()
-+  set(_arch_suffix 32)
-+endif()
-+
- #
- # Update library search directory hint variable with paths used by prebuilt boost binaries.
- #
-@@ -961,11 +967,7 @@ endfunction()
- #
- function(_Boost_UPDATE_WINDOWS_LIBRARY_SEARCH_DIRS_WITH_PREBUILT_PATHS componentlibvar basedir)
-   if("x${CMAKE_CXX_COMPILER_ID}" STREQUAL "xMSVC")
--    if(CMAKE_SIZEOF_VOID_P EQUAL 8)
--      set(_arch_suffix 64)
--    else()
--      set(_arch_suffix 32)
--    endif()
-+
-     if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.10)
-       list(APPEND ${componentlibvar} ${basedir}/lib${_arch_suffix}-msvc-14.1)
-       list(APPEND ${componentlibvar} ${basedir}/lib${_arch_suffix}-msvc-14.0)
-@@ -1038,7 +1040,7 @@ else()
-   # _Boost_COMPONENT_HEADERS.  See the instructions at the top of
-   # _Boost_COMPONENT_DEPENDENCIES.
-   set(_Boost_KNOWN_VERSIONS ${Boost_ADDITIONAL_VERSIONS}
--    "1.65.1" "1.65.0" "1.65"
-+    "1.65.1" "1.65.0" "1.65" "1.66.1" "1.66.0" "1.66"
-     "1.64.0" "1.64" "1.63.0" "1.63" "1.62.0" "1.62" "1.61.0" "1.61" "1.60.0" "1.60"
-     "1.59.0" "1.59" "1.58.0" "1.58" "1.57.0" "1.57" "1.56.0" "1.56" "1.55.0" "1.55"
-     "1.54.0" "1.54" "1.53.0" "1.53" "1.52.0" "1.52" "1.51.0" "1.51"
-@@ -1616,10 +1618,12 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS})
-   unset(_boost_RELEASE_NAMES)
-   foreach(compiler IN LISTS _boost_COMPILER)
-     list(APPEND _boost_RELEASE_NAMES
-+      ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-x${_arch_suffix}-${Boost_LIB_VERSION}
-       ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
-       ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG} )
-   endforeach()
-   list(APPEND _boost_RELEASE_NAMES
-+    ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-x${_arch_suffix}-${Boost_LIB_VERSION}
-     ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
-     ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
-     ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT} )
-@@ -1627,10 +1631,12 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS})
-     set(_boost_RELEASE_STATIC_ABI_TAG "-s${_boost_RELEASE_ABI_TAG}")
-     foreach(compiler IN LISTS _boost_COMPILER)
-       list(APPEND _boost_RELEASE_NAMES
-+        ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-x${_arch_suffix}-${Boost_LIB_VERSION}
-         ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
-         ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} )
-     endforeach()
-     list(APPEND _boost_RELEASE_NAMES
-+      ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-x${_arch_suffix}-${Boost_LIB_VERSION}
-       ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
-       ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} )
-   endif()
-@@ -1666,10 +1672,12 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS})
-   unset(_boost_DEBUG_NAMES)
-   foreach(compiler IN LISTS _boost_COMPILER)
-     list(APPEND _boost_DEBUG_NAMES
-+      ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-x${_arch_suffix}-${Boost_LIB_VERSION}
-       ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION}
-       ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG} )
-   endforeach()
-   list(APPEND _boost_DEBUG_NAMES
-+    ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-x${_arch_suffix}-${Boost_LIB_VERSION}
-     ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION}
-     ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
-     ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}
-@@ -1678,10 +1686,12 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS})
-     set(_boost_DEBUG_STATIC_ABI_TAG "-s${_boost_DEBUG_ABI_TAG}")
-     foreach(compiler IN LISTS _boost_COMPILER)
-       list(APPEND _boost_DEBUG_NAMES
-+      ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-x${_arch_suffix}-${Boost_LIB_VERSION}
-         ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
-         ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} )
-     endforeach()
-     list(APPEND _boost_DEBUG_NAMES
-+      ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-x${_arch_suffix}-${Boost_LIB_VERSION}
-       ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
-       ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} )
-   endif()
-diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake
-index 76afa8a..a854516 100644
---- a/Modules/FindPkgConfig.cmake
-+++ b/Modules/FindPkgConfig.cmake
-@@ -187,10 +187,10 @@ function(_pkg_create_imp_target _prefix _no_cmake_path _no_cmake_environment_pat
-   # set the options that are used as long as the .pc file does not provide a library
-   # path to look into
-   if(_no_cmake_path)
--    set(_find_opts "NO_CMAKE_PATH")
-+    list(APPEND _find_opts "NO_CMAKE_PATH")
-   endif()
-   if(_no_cmake_environment_path)
--    string(APPEND _find_opts " NO_CMAKE_ENVIRONMENT_PATH")
-+    list(APPEND _find_opts "NO_CMAKE_ENVIRONMENT_PATH")
-   endif()
- 
-   unset(_search_paths)
-@@ -454,7 +454,7 @@ macro(_pkg_check_modules_internal _is_required _is_silent _no_cmake_path _no_cma
-       _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" CFLAGS_OTHER        ""        --cflags-only-other )
- 
-       if (_imp_target)
--        _pkg_create_imp_target("${_prefix}" _no_cmake_path _no_cmake_environment_path)
-+        _pkg_create_imp_target("${_prefix}" ${_no_cmake_path} ${_no_cmake_environment_path})
-       endif()
-     endif()
- 
-@@ -597,7 +597,7 @@ macro(pkg_check_modules _prefix _module0)
-       _pkgconfig_set(__pkg_config_arguments_${_prefix} "${_module0};${ARGN}")
-     endif()
-   elseif (${_prefix}_FOUND AND ${_imp_target})
--    _pkg_create_imp_target("${_prefix}" _no_cmake_path _no_cmake_environment_path)
-+    _pkg_create_imp_target("${_prefix}" ${_no_cmake_path} ${_no_cmake_environment_path})
-   endif()
- endmacro()
- 
-@@ -648,7 +648,7 @@ macro(pkg_search_module _prefix _module0)
- 
-     _pkgconfig_set(__pkg_config_checked_${_prefix} ${PKG_CONFIG_VERSION})
-   elseif (${_prefix}_FOUND AND ${_imp_target})
--    _pkg_create_imp_target("${_prefix}" _no_cmake_path _no_cmake_environment_path)
-+    _pkg_create_imp_target("${_prefix}" ${_no_cmake_path} ${_no_cmake_environment_path})
-   endif()
- endmacro()
- 
-diff --git a/Tests/RunCMake/FindPkgConfig/FindPkgConfig_IMPORTED_TARGET.cmake b/Tests/RunCMake/FindPkgConfig/FindPkgConfig_IMPORTED_TARGET.cmake
-index 00cbb7b..606b1df 100644
---- a/Tests/RunCMake/FindPkgConfig/FindPkgConfig_IMPORTED_TARGET.cmake
-+++ b/Tests/RunCMake/FindPkgConfig/FindPkgConfig_IMPORTED_TARGET.cmake
-@@ -24,3 +24,64 @@ if (NCURSES_FOUND)
- else ()
-   message(STATUS "skipping test; ncurses not found")
- endif ()
-+
-+
-+# Setup for the remaining package tests below
-+set(PKG_CONFIG_USE_CMAKE_PREFIX_PATH)
-+set(fakePkgDir ${CMAKE_CURRENT_BINARY_DIR}/pc-fakepackage)
-+foreach(i 1 2)
-+  set(pname cmakeinternalfakepackage${i})
-+  file(WRITE ${fakePkgDir}/lib/lib${pname}.a "")
-+  file(WRITE ${fakePkgDir}/lib/${pname}.lib  "")
-+  file(WRITE ${fakePkgDir}/lib/pkgconfig/${pname}.pc
-+"Name: CMakeInternalFakePackage${i}
-+Description: Dummy package (${i}) for FindPkgConfig IMPORTED_TARGET test
-+Version: 1.2.3
-+Libs: -l${pname}
-+")
-+endforeach()
-+
-+# Always find the .pc file in the calls further below so that we can test that
-+# the import target find_library() calls handle the NO...PATH options correctly
-+set(ENV{PKG_CONFIG_PATH} ${fakePkgDir}/lib/pkgconfig)
-+
-+# Confirm correct behavior of NO_CMAKE_PATH, ensuring we only find the library
-+# for the imported target if we have both set CMAKE_PREFIX_PATH and have not
-+# given the NO_CMAKE_PATH option
-+unset(CMAKE_PREFIX_PATH)
-+unset(ENV{CMAKE_PREFIX_PATH})
-+pkg_check_modules(FakePackage1 QUIET IMPORTED_TARGET cmakeinternalfakepackage1)
-+if (TARGET PkgConfig::FakePackage1)
-+  message(FATAL_ERROR "Have import target for fake package 1 with no path prefix")
-+endif()
-+
-+set(CMAKE_PREFIX_PATH ${fakePkgDir})
-+pkg_check_modules(FakePackage1 QUIET IMPORTED_TARGET NO_CMAKE_PATH cmakeinternalfakepackage1)
-+if (TARGET PkgConfig::FakePackage1)
-+  message(FATAL_ERROR "Have import target for fake package 1 with ignored cmake path")
-+endif()
-+
-+pkg_check_modules(FakePackage1 REQUIRED QUIET IMPORTED_TARGET cmakeinternalfakepackage1)
-+if (NOT TARGET PkgConfig::FakePackage1)
-+  message(FATAL_ERROR "No import target for fake package 1 with prefix path")
-+endif()
-+
-+# And now do the same for the NO_CMAKE_ENVIRONMENT_PATH - ENV{CMAKE_PREFIX_PATH}
-+# combination
-+unset(CMAKE_PREFIX_PATH)
-+unset(ENV{CMAKE_PREFIX_PATH})
-+pkg_check_modules(FakePackage2 QUIET IMPORTED_TARGET cmakeinternalfakepackage2)
-+if (TARGET PkgConfig::FakePackage2)
-+  message(FATAL_ERROR "Have import target for fake package 2 with no path prefix")
-+endif()
-+
-+set(ENV{CMAKE_PREFIX_PATH} ${fakePkgDir})
-+pkg_check_modules(FakePackage2 QUIET IMPORTED_TARGET NO_CMAKE_ENVIRONMENT_PATH cmakeinternalfakepackage2)
-+if (TARGET PkgConfig::FakePackage2)
-+  message(FATAL_ERROR "Have import target for fake package 2 with ignored cmake path")
-+endif()
-+
-+pkg_check_modules(FakePackage2 REQUIRED QUIET IMPORTED_TARGET cmakeinternalfakepackage2)
-+if (NOT TARGET PkgConfig::FakePackage2)
-+  message(FATAL_ERROR "No import target for fake package 2 with prefix path")
-+endif()
diff --git a/cmake-3.10.3-SHA-256.txt b/cmake-3.10.3-SHA-256.txt
deleted file mode 100644
index b00b306..0000000
--- a/cmake-3.10.3-SHA-256.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-c0fac18cee8c15d04812740fe70f454f0a6b42d374b6908cf0ceb4bf2fcdcaf8  cmake-3.10.3-Darwin-x86_64.dmg
-e88d31a5200274407b7ea83cb2195ffc18cd6ceb1278b36c0501be6a118039a8  cmake-3.10.3-Darwin-x86_64.tar.gz
-3973fd56fd993bcbeb629841d84e9540118f015089d6b15591ddbba8d95ee3e3  cmake-3.10.3-Linux-x86_64.sh
-9e7c48b797484f74c5ee3ae55132b40b16ed8e81ee762402da8971205b0a896b  cmake-3.10.3-Linux-x86_64.tar.gz
-8ca3a659fb4eac567dc0b62f4315c0a23f65e15c337a54c12176df81ad86655c  cmake-3.10.3-win32-x86.msi
-edbbfb7f6f4e4f913de4a16d228cf6156ac7071596b6d25f2891a60a006735ea  cmake-3.10.3-win32-x86.zip
-0426c9509099dd7e2341443a5121a452c96d94466747383f1727d8c58af03df3  cmake-3.10.3-win64-x64.msi
-3bd57d1cfcf720a4cc72db77bda4c76a7b700fb0341821ad868963ad28856cd0  cmake-3.10.3-win64-x64.zip
-bd1d6e3649c367893e38958ae17d342707086bc694ec038b34b7c6fe303be5b6  cmake-3.10.3.tar.Z
-0c3a1dcf0be03e40cf4f341dda79c96ffb6c35ae35f2f911845b72dab3559cf8  cmake-3.10.3.tar.gz
-01d564ea7558910ed1e5575b772c595a003dd3ad58f11dae4cbb34121f4b2793  cmake-3.10.3.zip
diff --git a/cmake-3.10.3-SHA-256.txt.asc b/cmake-3.10.3-SHA-256.txt.asc
deleted file mode 100644
index 242e8fe..0000000
--- a/cmake-3.10.3-SHA-256.txt.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEExsJlMku+vcNQtRPQLSzvEDSSFoQFAlqrutkACgkQLSzvEDSS
-FoT30g//dWKe0WRIpbHku+GVOY23a278rIgPvvLf1Cz7cHAsJ0ic2sJgrkhaj/gW
-eTEAPci1F+7YiC7DXH7e/u1d0va+OIqeuAjgrUqXcHeINMMgg4t8X1lOmQ2Sg9eo
-a5yFO9rgZLVVUEccioaWey6bhfWdpswXCG4E2Fqfwf1lutmtrYYrk8Pc2CrEg+x0
-811vpSEtvtmmj+x9t6gjgn6StbCQg7DaOWyC11xzFYhUO5wRZfVxBTcpHD8mPIAo
-xk7GX7DuxKO4XHcW5EOG31TIDxNz5w4bcPVxOxXvu7k7boveh5IctaD/ahgl3i0O
-bbnX/kr5Y90GE15L+v5N1eqy2AICjLD8vIGrRUu7+eNyRoNl7NE0TEwWu1gCKBJF
-kPlnfI+z0HSNQLzOTBSIbd9qLUPFPORpT2NN+pEn++ek7KGQD86BKMogOQdLS0x1
-IEWiclcyVLVnokdVmQLweX8oM3vD/79EK5DVC1Vtf7P2BSlccv541qRS9tCwQWxS
-jCrEJ4ghmX7oYMLDqdnR0BG57d98QoiZYWTuc1lePqaDWgbrahea9k21ABD0kER4
-3HPEgqoNt8wfpMIULYV1LLc8waVFK7WoI1in5c9attV3FV3KV9yN3Knri6IKGPkP
-E9gBSG6lcUqH0iHzCbXIkBbhesHSAjgv63xZU4EEOvf89bdSO4Y=
-=EHvj
------END PGP SIGNATURE-----
diff --git a/cmake-3.10.3.tar.gz b/cmake-3.10.3.tar.gz
deleted file mode 100644
index 9efc9fb..0000000
--- a/cmake-3.10.3.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0c3a1dcf0be03e40cf4f341dda79c96ffb6c35ae35f2f911845b72dab3559cf8
-size 7825559
diff --git a/cmake-3.11.1-SHA-256.txt b/cmake-3.11.1-SHA-256.txt
new file mode 100644
index 0000000..1f1077f
--- /dev/null
+++ b/cmake-3.11.1-SHA-256.txt
@@ -0,0 +1,11 @@
+26592a607263b0270c2792f569aeb63168e2e1e1dead0bd5e57d4c868356bae5  cmake-3.11.1-Darwin-x86_64.dmg
+75f441052d64edcfd869882a5c6baed8d8280420114959313e68b344e24309c4  cmake-3.11.1-Darwin-x86_64.tar.gz
+b2d8028ff11727dbca4f1c2cd56d9d8b54698ee112aacf46ab199075c31813f6  cmake-3.11.1-Linux-x86_64.sh
+3aa8d3b53903563bdc13dfec80716c286b2228db36ef65c23bc616f9bb930367  cmake-3.11.1-Linux-x86_64.tar.gz
+ec44e70bda43759e76f48d0f33ab214753b6e4b29b282d09e2dc13512fc66bd4  cmake-3.11.1-win32-x86.msi
+415a24c0c1250514747ea3c1d45b1930bc51dc5d6acb01062e1d680051bb0ea9  cmake-3.11.1-win32-x86.zip
+13544e606d65bbca352768d78dbaa4f387c4c44f8b605d033406eb0c199aff95  cmake-3.11.1-win64-x64.msi
+ed23c3d22e164fae7300c82db3e72eac4648e016eabdeace1bd573a9a6ecd218  cmake-3.11.1-win64-x64.zip
+acd4fd0b687ef0a32596bcc8d63da730ce0f299c0ae3885fa6c9f5d4fad46096  cmake-3.11.1.tar.Z
+57bebc6ca4d1d42c6385249d148d9216087e0fda57a47dc5c858790a70217d0c  cmake-3.11.1.tar.gz
+3beef1e00c7b595258f97a2c10a28332d4a39ced59927f9ab7d0680779c66f28  cmake-3.11.1.zip
diff --git a/cmake-3.11.1-SHA-256.txt.asc b/cmake-3.11.1-SHA-256.txt.asc
new file mode 100644
index 0000000..55c05da
--- /dev/null
+++ b/cmake-3.11.1-SHA-256.txt.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEExsJlMku+vcNQtRPQLSzvEDSSFoQFAlrV+egACgkQLSzvEDSS
+FoSilw//bUreqdPUCvK6ASOFARakIVPsg16NAVJa51Yb6gCVPfmrLHDIopvcX5f3
+kj9wndO1akX/ILzQmxXykupJJRqLhhf3x4fd1j5YHsfnp2e270tzj8ehW4NUhfWx
+2qQO2nMd2dU5b2WjmgmAKqktvCQVMyfpcrTHFtMr9ddFWdnrzAwdgiub0atE2vgb
+PyaCbip8PmkTMfypFMVhr7hYbGpquPZrZhLv7/GuL+HP4xyXYVfFFyBP1fUdAiJi
+OUzizDP0Kqhs6MHWAMeNKsu6eCQ07Z6v9TBtNC3UJMkV6TjJ3VbA4fYhiPbFRVhu
+KGKlsmZi8ddozMcp11kuXyFLzff1GCymzUS/RQB/7Lx7nTlXVnn2kuITRU479JvP
+zLBc8dqfzmagOJ5cCgjHHHd2dlPyrUupKZo1N+uhk3KcUUVRktklk+d+18jyYUrD
+aAHeKYCvy/6QyIeZ1l6OOoxCmALU51tQ84MAjqB1v7+/0ho2MzpuPZUGbmp0r0zq
+Ee78xpFqPGEec0hlaCEeSpH0UEvHya3czh00rzd03Voys0S6r6GqPkwwkhzYX1ba
+zlOBmICZGYC/YrZmpTpmB+DhyKsNeBQaGPNwIZYYD1GhAOYQJ1XXYa3/WZRwgp3q
+JF8nmhfLTYvX3nr4fXNAtIrW0oyGqrRIGuim4ZDzcOkdnIdkDUs=
+=5BBo
+-----END PGP SIGNATURE-----
diff --git a/cmake-3.11.1.tar.gz b/cmake-3.11.1.tar.gz
new file mode 100644
index 0000000..61180b8
--- /dev/null
+++ b/cmake-3.11.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:57bebc6ca4d1d42c6385249d148d9216087e0fda57a47dc5c858790a70217d0c
+size 7951125
diff --git a/cmake-fix-ruby-test.patch b/cmake-fix-ruby-test.patch
index 750c496..a62a5ac 100644
--- a/cmake-fix-ruby-test.patch
+++ b/cmake-fix-ruby-test.patch
@@ -1,6 +1,8 @@
---- a/Modules/FindRuby.cmake      2016-11-15 23:00:54.832228081 +0100
-+++ b/Modules/FindRuby.cmake      2016-11-15 23:01:55.201700739 +0100
-@@ -107,7 +107,7 @@
+Index: b/Modules/FindRuby.cmake
+===================================================================
+--- a/Modules/FindRuby.cmake
++++ b/Modules/FindRuby.cmake
+@@ -110,7 +110,7 @@ if(RUBY_EXECUTABLE  AND NOT  RUBY_VERSIO
     _RUBY_CONFIG_VAR("sitelibdir" RUBY_SITELIB_DIR)
  
     # vendor_ruby available ?
diff --git a/cmake-gui.changes b/cmake-gui.changes
index b416f77..a3a1130 100644
--- a/cmake-gui.changes
+++ b/cmake-gui.changes
@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Wed May  9 22:37:12 UTC 2018 - foss@grueninger.de
+
+- Updateo to 3.11.1
+  * No changes specific to CMake-GUI
+
+-------------------------------------------------------------------
+Wed Apr  4 10:46:28 UTC 2018 - mpluskal@suse.com
+
+- Cleanup spec file with spec-clener
+- Drop conditions for building on Leap
+
+-------------------------------------------------------------------
+Wed Mar 28 22:41:54 UTC 2018 - foss@grueninger.de
+
+- Updateo to 3.11.0
+  * No changes specific to CMake-GUI
+
 -------------------------------------------------------------------
 Fri Mar 16 19:05:39 UTC 2018 - avindra@opensuse.org
 
diff --git a/cmake-gui.spec b/cmake-gui.spec
index adfb7cb..14aea56 100644
--- a/cmake-gui.spec
+++ b/cmake-gui.spec
@@ -16,14 +16,14 @@
 #
 
 
-%define shortversion 3.10
+%define shortversion 3.11
 Name:           cmake-gui
-Version:        3.10.3
+Version:        3.11.1
 Release:        0
 Summary:        CMake graphical user interface
 License:        BSD-3-Clause
 Group:          Development/Tools/Building
-Url:            https://www.cmake.org/
+URL:            https://www.cmake.org/
 Source0:        https://www.cmake.org/files/v%{shortversion}/cmake-%{version}.tar.gz
 Source5:        https://www.cmake.org/files/v%{shortversion}/cmake-%{version}-SHA-256.txt
 Source6:        https://www.cmake.org/files/v%{shortversion}/cmake-%{version}-SHA-256.txt.asc
@@ -37,22 +37,15 @@ BuildRequires:  fdupes
 BuildRequires:  gcc-c++
 BuildRequires:  libarchive-devel >= 3.0.2
 BuildRequires:  libexpat-devel
-BuildRequires:  openssl-devel
-BuildRequires:  rhash-devel
-# use libuv package for Leap and Tumbleweed
-%if (0%{?suse_version} > 1320 || (0%{?suse_version} == 1315 && 0%{?is_opensuse}))
 BuildRequires:  libuv-devel
-%define use_system_uvlib ON
-# otherwise use libuv part of CMake tarball
-%else
-%define use_system_uvlib OFF
-%endif
+BuildRequires:  openssl-devel
 # this is commented as it would create dependancy cycle between jsoncpp and cmake
 #if 0%{?suse_version} > 1320
 #BuildRequires:  pkgconfig(jsoncpp)
 #endif
 BuildRequires:  pkgconfig
 BuildRequires:  python-sphinx
+BuildRequires:  rhash-devel
 BuildRequires:  update-desktop-files
 BuildRequires:  zlib-devel
 BuildRequires:  pkgconfig(Qt5Widgets)
@@ -96,7 +89,7 @@ export CXXFLAGS="%{optflags}"
     --verbose \
     --qt-gui \
     -- \
-    -DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=%{use_system_uvlib}
+    -DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=ON
 make VERBOSE=1 %{?_smp_mflags}
 
 %install
diff --git a/cmake.changes b/cmake.changes
index 25f585a..f8312e3 100644
--- a/cmake.changes
+++ b/cmake.changes
@@ -1,3 +1,42 @@
+-------------------------------------------------------------------
+Wed May  9 22:33:46 UTC 2018 - foss@grueninger.de
+
+- update to 3.11.1
+  * Revert "CheckIncludeFiles: Honor CMAKE_REQUIRED_LIBRARIES"
+  * Restore support for explicitly referenced CMakeLists.txt sources
+  * Exclude "libgcc_eh" library files from implicit link libraries
+  full changelog https://cmake.org/cmake/help/v3.11/release/3.11.html#id1
+- Adapted system-libs.patch
+
+-------------------------------------------------------------------
+Mon Apr 16 10:19:27 UTC 2018 - hpj@urpla.net
+
+- allow build with curl libs from older distributions
+- refresh patches
+
+-------------------------------------------------------------------
+Wed Apr  4 10:46:49 UTC 2018 - mpluskal@suse.com
+
+- Cleanup spec file with spec-cleaner
+- Drop conditions for building on Leap
+
+-------------------------------------------------------------------
+Wed Mar 28 22:27:12 UTC 2018 - foss@grueninger.de
+
+- Updated to 3.11.0
+  * The Makefile Generators and the Ninja generator learned to add
+    compiler launcher tools
+  * The COMPILE_DEFINITIONS source file property learned to support
+    generator expressions.
+  * COMPILE_OPTIONS source file property was added to manage list
+    of options to pass to the compiler.
+  * A new FetchContent module was added which supports populating
+    content at configure time using any of the download/update
+    methods supported by ExternalProject_Add().
+  full changelog: https://cmake.org/cmake/help/v3.11/release/3.11.html
+- Adapted form.patch and c17-default.patch
+- Drop cmake-3.10.1_boost-1.66.patch as it is included in upstream
+
 -------------------------------------------------------------------
 Fri Mar 16 19:06:10 UTC 2018 - avindra@opensuse.org
 
diff --git a/cmake.spec b/cmake.spec
index ae30d7a..e14b7db 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -16,14 +16,14 @@
 #
 
 
-%define shortversion 3.10
+%define shortversion 3.11
 Name:           cmake
-Version:        3.10.3
+Version:        3.11.1
 Release:        0
 Summary:        Cross-platform, open-source make system
 License:        BSD-3-Clause
 Group:          Development/Tools/Building
-Url:            https://www.cmake.org/
+URL:            https://www.cmake.org/
 Source0:        https://www.cmake.org/files/v%{shortversion}/%{name}-%{version}.tar.gz
 Source1:        cmake.macros
 # bnc#947585 - Let CMake produces automatic RPM provides
@@ -37,35 +37,27 @@ Patch2:         cmake-fix-ruby-test.patch
 Patch4:         form.patch
 # PATCH-FIX-UPSTREAM system-libs.patch -- allow choosing between bundled and system jsoncpp & form libs
 Patch5:         system-libs.patch
-Patch6:         cmake-3.10.1_boost-1.66.patch
 # Search for python interpreters from newest to oldest rather then picking up /usr/bin/python as first choice
 Patch7:         feature-suse-python-interp-search-order.patch
 Patch8:         c17-default.patch
-%if 0%{?suse_version} >= 1330
-BuildRequires:  libcurl-mini-devel
-%else
-BuildRequires:  curl-devel
-%endif
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
 BuildRequires:  libarchive-devel >= 3.0.2
 BuildRequires:  libbz2-devel
-BuildRequires:  libexpat-devel
-BuildRequires:  rhash-devel
-# use libuv package for Leap and Tumbleweed
-%if (0%{?suse_version} > 1320 || (0%{?suse_version} == 1315 && 0%{?is_opensuse}))
-BuildRequires:  libuv-devel
-%define use_system_uvlib ON
-# otherwise use libuv part of CMake tarball
+%if 0%{?suse_version} >= 1330
+BuildRequires:  libcurl-mini-devel
 %else
-%define use_system_uvlib OFF
+BuildRequires:  libcurl-devel
 %endif
+BuildRequires:  libexpat-devel
+BuildRequires:  libuv-devel
 BuildRequires:  ncurses-devel
 # this is commented as it would create dependancy cycle between jsoncpp and cmake
 #if 0%{?suse_version} > 1320
 #BuildRequires:  pkgconfig(jsoncpp)
 #endif
 BuildRequires:  pkgconfig
+BuildRequires:  rhash-devel
 BuildRequires:  zlib-devel
 BuildRequires:  pkgconfig(liblzma)
 Requires:       make
@@ -98,7 +90,7 @@ export CXXFLAGS="%{optflags}"
     --verbose \
     --no-qt-gui \
     -- \
-    -DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=%{use_system_uvlib}
+    -DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=ON
 make VERBOSE=1 %{?_smp_mflags}
 
 %install
diff --git a/form.patch b/form.patch
index db77a02..6b0809a 100644
--- a/form.patch
+++ b/form.patch
@@ -3,7 +3,7 @@ index 7d4e88c..0cc5357 100644
 --- a/Source/CursesDialog/CMakeLists.txt
 +++ b/Source/CursesDialog/CMakeLists.txt
 @@ -17,7 +17,7 @@
-               CursesDialog/ccmake
+               CursesDialog/ccmake.cxx
     )
  
 -include_directories(${CURSES_INCLUDE_PATH})
diff --git a/system-libs.patch b/system-libs.patch
index 543b299..96f8f52 100644
--- a/system-libs.patch
+++ b/system-libs.patch
@@ -1,15 +1,17 @@
---- cmake-3.5.0/bootstrap.old
-+++ cmake-3.5.0/bootstrap
-@@ -724,10 +724,10 @@
+Index: b/bootstrap
+===================================================================
+--- a/bootstrap
++++ b/bootstrap
+@@ -803,10 +803,10 @@ while test $# != 0; do
    --init=*) cmake_init_file=`cmake_arg "$1"` ;;
    --system-libs) cmake_bootstrap_system_libs="${cmake_bootstrap_system_libs} -DCMAKE_USE_SYSTEM_LIBRARIES=1" ;;
    --no-system-libs) cmake_bootstrap_system_libs="${cmake_bootstrap_system_libs} -DCMAKE_USE_SYSTEM_LIBRARIES=0" ;;
--  --system-bzip2|--system-curl|--system-expat|--system-jsoncpp|--system-libarchive|--system-librhash|--system-zlib|--system-liblzma)
-+  --system-bzip2|--system-curl|--system-expat|--system-from|--system-jsoncpp|--system-libarchive|--system-librhash|--system-zlib|--system-liblzma)
+-  --system-bzip2|--system-curl|--system-expat|--system-jsoncpp|--system-libarchive|--system-librhash|--system-zlib|--system-liblzma|--system-libuv)
++  --system-bzip2|--system-curl|--system-expat|--system-from|--system-jsoncpp|--system-libarchive|--system-librhash|--system-zlib|--system-liblzma|--system-libuv)
      lib=`cmake_arg "$1" "--system-"`
      cmake_bootstrap_system_libs="${cmake_bootstrap_system_libs} -DCMAKE_USE_SYSTEM_LIBRARY_`cmake_toupper $lib`=1" ;;
--  --no-system-bzip2|--no-system-curl|--no-system-expat|--no-system-jsoncpp|--no-system-libarchive|--no-system-librhash|--no-system-zlib|--no-system-liblzma)
-+  --no-system-bzip2|--no-system-curl|--no-system-expat|--no-system-form|--no-system-jsoncpp|--no-system-libarchive|--no-system-librhash|--no-system-zlib|--no-system-liblzma)
+-  --no-system-bzip2|--no-system-curl|--no-system-expat|--no-system-jsoncpp|--no-system-libarchive|--no-system-librhash|--no-system-zlib|--no-system-liblzma|--no-system-libuv)
++  --no-system-bzip2|--no-system-curl|--no-system-expat|--no-system-form|--no-system-jsoncpp|--no-system-libarchive|--no-system-librhash|--no-system-zlib|--no-system-liblzma|--no-system-libuv)
      lib=`cmake_arg "$1" "--no-system-"`
      cmake_bootstrap_system_libs="${cmake_bootstrap_system_libs} -DCMAKE_USE_SYSTEM_LIBRARY_`cmake_toupper $lib`=0" ;;
    --qt-gui) cmake_bootstrap_qt_gui="1" ;;