UPDATE: devel/cmake (switch to py3, enable DEBUG_PACKAGES, new {py,ruby,lua,java} handling)

Rafael Sadowski Sun, 17 May 2020 22:08:28 -0700

This diff currently runs through a full amd64 bulk build. I send this
diff in advance to discuss it. Here a list of imported port changes:


- Update CMmke to 3.17.2

- Switch CMake to pyhton3

- Remove all Modules under files. This should no longer be necessary.

- Remove our self hacked MODJAVA* MODLUA* MODPY* MODRUBY* modules.
  - Instead we help the original cmake modules, see cmake.port.mk. That
    saves and all these patches and is in my opinion more correct!

- Fix cmake debug packages:
  - If DEBUG_PACKAGES set don't create install stripa rule. Idea by
    landry@

What do you think? I would like to commit this diff if the bulk build
is successful.

Opinions?

diff --git a/devel/cmake/Makefile b/devel/cmake/Makefile
index 91b69c9cf98..4492613f889 100644
--- a/devel/cmake/Makefile
+++ b/devel/cmake/Makefile
@@ -4,11 +4,10 @@ DPB_PROPERTIES =      parallel
 
 COMMENT =      portable build system
 
-VER =          3.16.2
+VER =          3.17.2
 EPOCH =                0
 DISTNAME =     cmake-${VER}
 CATEGORIES =   devel
-REVISION =     1
 
 HOMEPAGE =     https://www.cmake.org/
 
@@ -22,7 +21,11 @@ WANTLIB += jsoncpp m rhash uv z
 
 COMPILER =             base-clang ports-gcc
 
-BUILD_DEPENDS +=       textproc/py-sphinx>=1.4
+MODULES =              lang/python
+MODPY_VERSION =                ${MODPY_DEFAULT_VERSION_3}
+MODPY_RUNDEP =         No
+
+BUILD_DEPENDS =                textproc/py-sphinx${MODPY_FLAVOR}
 
 LIB_DEPENDS =          archivers/libarchive \
                        devel/libuv \
@@ -38,7 +41,7 @@ CONFIGURE_ARGS =      --datadir=share/cmake \
                        --no-qt-gui \
                        --parallel=${MAKE_JOBS} \
                        --prefix=${PREFIX} \
-                       --sphinx-build=${LOCALBASE}/bin/sphinx-build \
+                       
--sphinx-build=${LOCALBASE}/bin/sphinx-build${MODPY_BIN_SUFFIX} \
                        --sphinx-html \
                        --sphinx-man \
                        --system-libs \
@@ -71,7 +74,6 @@ post-patch:
                ${WRKSRC}/Modules/FindDCMTK.cmake \
 
 pre-configure:
-       cp ${FILESDIR}/*.cmake ${WRKSRC}/Modules/
        find ${WRKSRC}/Modules -name "*.cmake" -exec ${SUBST_CMD} {} +
        find ${WRKSRC}/Tests -name "CMakeLists.txt" -exec ${SUBST_CMD} {} +
        ${SUBST_CMD} ${SUBST_FILES}
diff --git a/devel/cmake/cmake.port.mk b/devel/cmake/cmake.port.mk
index 750b671b47a..ab14ee38ca2 100644
--- a/devel/cmake/cmake.port.mk
+++ b/devel/cmake/cmake.port.mk
@@ -50,16 +50,34 @@ _MODCMAKE_GEN = "Unix Makefiles"
 DPB_PROPERTIES += nojunk
 .endif
 
-CONFIGURE_ENV +=       MODJAVA_VER=${MODJAVA_VER} \
-                       MODLUA_VERSION=${MODLUA_VERSION} \
-                       MODLUA_BIN=${MODLUA_BIN} \
-                       MODLUA_INCL_DIR=${MODLUA_INCL_DIR} \
-                       MODPY_VERSION=${MODPY_VERSION} \
-                       MODPY_BIN=${MODPY_BIN} \
-                       MODPY_INCDIR=${MODPY_INCDIR} \
-                       MODPY_LIBDIR=${MODPY_LIBDIR} \
-                       MODRUBY_REV=${MODRUBY_REV} \
-                       MODTCL_VERSION=${MODTCL_VERSION} \
+# JAVA
+.if ${MODULES:Mjava}
+CONFIGURE_ENV +=       JAVA_HOME=${JAVA_HOME}
+MAKE_ENV +=    JAVA_HOME=${JAVA_HOME}
+.endif
+
+# Python
+.if ${MODULES:Mlang/python}
+# 
https://cmake.org/cmake/help/latest/module/FindPython3.html#artifacts-specification
+CONFIGURE_ARGS +=      -DPYTHON_EXECUTABLE=${MODPY_BIN}
+CONFIGURE_ARGS +=      -DPYTHON_LIBRARY_DIRS=${MODPY_LIBDIR}
+CONFIGURE_ARGS +=      -DPYTHON_INCLUDE_DIR=${MODPY_INCDIR}
+.endif
+
+# Lua
+.if ${MODULES:Mlang/lua}
+CONFIGURE_ARGS +=      -DLUA_INCLUDE_DIR=${MODLUA_INCL_DIR}
+.endif
+
+# Ruby
+.if ${MODULES:Mlang/ruby}
+# https://cmake.org/cmake/help/latest/module/FindRuby.html
+CONFIGURE_ARGS +=      -DRUBY_EXECUTABLE=${RUBY}
+.endif
+
+# XXX Remove hackish patches
+# Tcl/Tk
+CONFIGURE_ENV +=       MODTCL_VERSION=${MODTCL_VERSION} \
                        MODTK_VERSION=${MODTK_VERSION} \
                        MODTCL_INCDIR=${MODTCL_INCDIR} \
                        MODTK_INCDIR=${MODTK_INCDIR} \
diff --git a/devel/cmake/distinfo b/devel/cmake/distinfo
index 0ff61db04f0..e56e6ac943f 100644
--- a/devel/cmake/distinfo
+++ b/devel/cmake/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cmake-3.16.2.tar.gz) = jAl4bsYMor41TCmCkHLDgRPekYTymSjrnahEal8s5qk=
-SIZE (cmake-3.16.2.tar.gz) = 9109837
+SHA256 (cmake-3.17.2.tar.gz) = /HcyTE+CCgkFKneFVJuANf+NNGHe1bvYDSUq59HNOqU=
+SIZE (cmake-3.17.2.tar.gz) = 9469251
diff --git a/devel/cmake/files/FindIconv.cmake 
b/devel/cmake/files/FindIconv.cmake
deleted file mode 100644
index 028df5c1ae5..00000000000
--- a/devel/cmake/files/FindIconv.cmake
+++ /dev/null
@@ -1,58 +0,0 @@
-# - Try to find Iconv 
-# Once done this will define 
-# 
-#  ICONV_FOUND - system has Iconv 
-#  ICONV_INCLUDE_DIR - the Iconv include directory 
-#  ICONV_LIBRARIES - Link these to use Iconv 
-#  ICONV_SECOND_ARGUMENT_IS_CONST - the second argument for iconv() is const
-# 
-include(CheckCXXSourceCompiles)
-
-IF (ICONV_INCLUDE_DIR AND ICONV_LIBRARIES)
-  # Already in cache, be silent
-  SET(ICONV_FIND_QUIETLY TRUE)
-ENDIF (ICONV_INCLUDE_DIR AND ICONV_LIBRARIES)
-
-FIND_PATH(ICONV_INCLUDE_DIR iconv.h) 
- 
-FIND_LIBRARY(ICONV_LIBRARIES NAMES iconv libiconv libiconv-2 c)
- 
-IF(ICONV_INCLUDE_DIR AND ICONV_LIBRARIES) 
-   SET(ICONV_FOUND TRUE) 
-ENDIF(ICONV_INCLUDE_DIR AND ICONV_LIBRARIES) 
-
-set(CMAKE_REQUIRED_INCLUDES ${ICONV_INCLUDE_DIR})
-set(CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBRARIES})
-IF(ICONV_FOUND)
-  check_cxx_source_compiles("
-  #include <iconv.h>
-  int main(){
-    iconv_t conv = 0;
-    const char* in = 0;
-    size_t ilen = 0;
-    char* out = 0;
-    size_t olen = 0;
-    iconv(conv, &in, &ilen, &out, &olen);
-    return 0;
-  }
-" ICONV_SECOND_ARGUMENT_IS_CONST )
-ENDIF(ICONV_FOUND)
-set(CMAKE_REQUIRED_INCLUDES)
-set(CMAKE_REQUIRED_LIBRARIES)
-
-IF(ICONV_FOUND) 
-  IF(NOT ICONV_FIND_QUIETLY) 
-    MESSAGE(STATUS "Found Iconv: ${ICONV_LIBRARIES}") 
-  ENDIF(NOT ICONV_FIND_QUIETLY) 
-ELSE(ICONV_FOUND) 
-  IF(Iconv_FIND_REQUIRED) 
-    MESSAGE(FATAL_ERROR "Could not find Iconv") 
-  ENDIF(Iconv_FIND_REQUIRED) 
-ENDIF(ICONV_FOUND) 
-
-MARK_AS_ADVANCED(
-  ICONV_INCLUDE_DIR
-  ICONV_LIBRARIES
-  ICONV_SECOND_ARGUMENT_IS_CONST
-)
-
diff --git a/devel/cmake/files/FindLCMS.cmake b/devel/cmake/files/FindLCMS.cmake
deleted file mode 100644
index 20d38b6c9ba..00000000000
--- a/devel/cmake/files/FindLCMS.cmake
+++ /dev/null
@@ -1,61 +0,0 @@
-# - Find LCMS
-# Find the LCMS (Little Color Management System) library and includes and
-# This module defines
-#  LCMS_INCLUDE_DIR, where to find lcms.h
-#  LCMS_LIBRARIES, the libraries needed to use LCMS.
-#  LCMS_DOT_VERSION, The version number of the LCMS library, e.g. "1.19"
-#  LCMS_VERSION, Similar to LCMS_DOT_VERSION, but without the dots, e.g. "119"
-#  LCMS_FOUND, If false, do not try to use LCMS.
-#
-# The minimum required version of LCMS can be specified using the
-# standard syntax, e.g. find_package(LCMS 1.10)
-
-# Copyright (c) 2008, Adrian Page, <[email protected]>
-# Copyright (c) 2009, Cyrille Berger, <[email protected]>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-
-# use pkg-config to get the directories and then use these values
-# in the FIND_PATH() and FIND_LIBRARY() calls
-if(NOT WIN32)
-   find_package(PkgConfig)
-   pkg_check_modules(PC_LCMS lcms)
-   set(LCMS_DEFINITIONS ${PC_LCMS_CFLAGS_OTHER})
-endif(NOT WIN32)
-
-find_path(LCMS_INCLUDE_DIR lcms.h
-   HINTS
-   ${PC_LCMS_INCLUDEDIR}
-   ${PC_LCMS_INCLUDE_DIRS}
-   PATH_SUFFIXES lcms liblcms1
-)
-
-find_library(LCMS_LIBRARIES NAMES lcms liblcms lcms-1 liblcms-1
-   HINTS
-   ${PC_LCMS_LIBDIR}
-   ${PC_LCMS_LIBRARY_DIRS}
-   PATH_SUFFIXES lcms
-)
-
-# Store the LCMS version number in the cache, so we don't have to search every 
time again
-if(LCMS_INCLUDE_DIR  AND NOT  LCMS_VERSION)
-   file(READ ${LCMS_INCLUDE_DIR}/lcms.h LCMS_VERSION_CONTENT)
-   string(REGEX MATCH "#define LCMS_VERSION[ ]*[0-9]*\n" LCMS_VERSION_MATCH 
${LCMS_VERSION_CONTENT})
-   if(LCMS_VERSION_MATCH)
-      string(REGEX REPLACE "#define LCMS_VERSION[ ]*([0-9]*)\n" "\\1" 
_LCMS_VERSION ${LCMS_VERSION_MATCH})
-      string(SUBSTRING ${_LCMS_VERSION} 0 1 LCMS_MAJOR_VERSION)
-      string(SUBSTRING ${_LCMS_VERSION} 1 2 LCMS_MINOR_VERSION)
-   endif(LCMS_VERSION_MATCH)
-   set(LCMS_VERSION "${LCMS_MAJOR_VERSION}${LCMS_MINOR_VERSION}" CACHE STRING 
"Version number of lcms" FORCE)
-   set(LCMS_DOT_VERSION "${LCMS_MAJOR_VERSION}.${LCMS_MINOR_VERSION}" CACHE 
STRING "Version number of lcms split into components" FORCE)
-endif(LCMS_INCLUDE_DIR  AND NOT  LCMS_VERSION)
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(LCMS REQUIRED_VARS LCMS_LIBRARIES 
LCMS_INCLUDE_DIR
-                                       VERSION_VAR LCMS_DOT_VERSION )
-
-mark_as_advanced(LCMS_INCLUDE_DIR LCMS_LIBRARIES LCMS_VERSION)
-
-
diff --git a/devel/cmake/files/FindLua.cmake b/devel/cmake/files/FindLua.cmake
deleted file mode 100644
index ab4e96d3795..00000000000
--- a/devel/cmake/files/FindLua.cmake
+++ /dev/null
@@ -1,211 +0,0 @@
-# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
-# file Copyright.txt or https://cmake.org/licensing for details.
-
-# XXX
-# FindLua.cmake from 3.10.2
-
-#.rst:
-# FindLua
-# -------
-#
-#
-#
-# Locate Lua library This module defines
-#
-# ::
-#
-#   LUA_FOUND          - if false, do not try to link to Lua
-#   LUA_LIBRARIES      - both lua and lualib
-#   LUA_INCLUDE_DIR    - where to find lua.h
-#   LUA_VERSION_STRING - the version of Lua found
-#   LUA_VERSION_MAJOR  - the major version of Lua
-#   LUA_VERSION_MINOR  - the minor version of Lua
-#   LUA_VERSION_PATCH  - the patch version of Lua
-#
-#
-#
-# Note that the expected include convention is
-#
-# ::
-#
-#   #include "lua.h"
-#
-# and not
-#
-# ::
-#
-#   #include <lua/lua.h>
-#
-# This is because, the lua location is not standardized and may exist in
-# locations other than lua/
-
-unset(_lua_include_subdirs)
-unset(_lua_library_names)
-unset(_lua_append_versions)
-
-set(MODLUA_VERSION $ENV{MODLUA_VERSION})
-set(MODLUA_INCL_DIR $ENV{MODLUA_INCL_DIR})
-
-# this is a function only to have all the variables inside go away 
automatically
-function(_lua_set_version_vars)
-    if(MODLUA_VERSION)
-        set(LUA_VERSIONS5 ${MODLUA_VERSION})
-    else()
-        set(LUA_VERSIONS5 5.3 5.2 5.1 5.0)
-    endif()
-
-    if (Lua_FIND_VERSION_EXACT)
-        if (Lua_FIND_VERSION_COUNT GREATER 1)
-            set(_lua_append_versions 
${Lua_FIND_VERSION_MAJOR}.${Lua_FIND_VERSION_MINOR})
-        endif ()
-    elseif (Lua_FIND_VERSION)
-        # once there is a different major version supported this should become 
a loop
-        if (NOT Lua_FIND_VERSION_MAJOR GREATER 5)
-            if (Lua_FIND_VERSION_COUNT EQUAL 1)
-                set(_lua_append_versions ${LUA_VERSIONS5})
-            else ()
-                foreach (subver IN LISTS LUA_VERSIONS5)
-                    if (NOT subver VERSION_LESS ${Lua_FIND_VERSION})
-                        list(APPEND _lua_append_versions ${subver})
-                    endif ()
-                endforeach ()
-            endif ()
-        endif ()
-    else ()
-        # once there is a different major version supported this should become 
a loop
-        set(_lua_append_versions ${LUA_VERSIONS5})
-    endif ()
-
-    list(APPEND _lua_include_subdirs "include/lua" "include")
-
-    foreach (ver IN LISTS _lua_append_versions)
-        string(REGEX MATCH "^([0-9]+)\\.([0-9]+)$" _ver "${ver}")
-        list(APPEND _lua_include_subdirs
-             include/lua${CMAKE_MATCH_1}${CMAKE_MATCH_2}
-             include/lua${CMAKE_MATCH_1}.${CMAKE_MATCH_2}
-             include/lua-${CMAKE_MATCH_1}.${CMAKE_MATCH_2}
-        )
-    endforeach ()
-
-    set(_lua_include_subdirs "${_lua_include_subdirs}" PARENT_SCOPE)
-    set(_lua_append_versions "${_lua_append_versions}" PARENT_SCOPE)
-endfunction(_lua_set_version_vars)
-
-function(_lua_check_header_version _hdr_file)
-    # At least 5.[012] have different ways to express the version
-    # so all of them need to be tested. Lua 5.2 defines LUA_VERSION
-    # and LUA_RELEASE as joined by the C preprocessor, so avoid those.
-    file(STRINGS "${_hdr_file}" lua_version_strings
-         REGEX "^#define[ \t]+LUA_(RELEASE[ \t]+\"Lua [0-9]|VERSION([ 
\t]+\"Lua [0-9]|_[MR])).*")
-
-    string(REGEX REPLACE ".*;#define[ \t]+LUA_VERSION_MAJOR[ \t]+\"([0-9])\"[ 
\t]*;.*" "\\1" LUA_VERSION_MAJOR ";${lua_version_strings};")
-    if (LUA_VERSION_MAJOR MATCHES "^[0-9]+$")
-        string(REGEX REPLACE ".*;#define[ \t]+LUA_VERSION_MINOR[ 
\t]+\"([0-9])\"[ \t]*;.*" "\\1" LUA_VERSION_MINOR ";${lua_version_strings};")
-        string(REGEX REPLACE ".*;#define[ \t]+LUA_VERSION_RELEASE[ 
\t]+\"([0-9])\"[ \t]*;.*" "\\1" LUA_VERSION_PATCH ";${lua_version_strings};")
-        set(LUA_VERSION_STRING 
"${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}.${LUA_VERSION_PATCH}")
-    else ()
-        string(REGEX REPLACE ".*;#define[ \t]+LUA_RELEASE[ \t]+\"Lua 
([0-9.]+)\"[ \t]*;.*" "\\1" LUA_VERSION_STRING ";${lua_version_strings};")
-        if (NOT LUA_VERSION_STRING MATCHES "^[0-9.]+$")
-            string(REGEX REPLACE ".*;#define[ \t]+LUA_VERSION[ \t]+\"Lua 
([0-9.]+)\"[ \t]*;.*" "\\1" LUA_VERSION_STRING ";${lua_version_strings};")
-        endif ()
-        string(REGEX REPLACE "^([0-9]+)\\.[0-9.]*$" "\\1" LUA_VERSION_MAJOR 
"${LUA_VERSION_STRING}")
-        string(REGEX REPLACE "^[0-9]+\\.([0-9]+)[0-9.]*$" "\\1" 
LUA_VERSION_MINOR "${LUA_VERSION_STRING}")
-        string(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]).*" "\\1" 
LUA_VERSION_PATCH "${LUA_VERSION_STRING}")
-    endif ()
-    foreach (ver IN LISTS _lua_append_versions)
-        if (ver STREQUAL "${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}")
-            set(LUA_VERSION_MAJOR ${LUA_VERSION_MAJOR} PARENT_SCOPE)
-            set(LUA_VERSION_MINOR ${LUA_VERSION_MINOR} PARENT_SCOPE)
-            set(LUA_VERSION_PATCH ${LUA_VERSION_PATCH} PARENT_SCOPE)
-            set(LUA_VERSION_STRING ${LUA_VERSION_STRING} PARENT_SCOPE)
-            return()
-        endif ()
-    endforeach ()
-endfunction(_lua_check_header_version)
-
-_lua_set_version_vars()
-
-if(MODLUA_INCL_DIR)
-    set(LUA_INCLUDE_DIR "${MODLUA_INCL_DIR}")
-endif()
-
-if (LUA_INCLUDE_DIR AND EXISTS "${LUA_INCLUDE_DIR}/lua.h")
-    _lua_check_header_version("${LUA_INCLUDE_DIR}/lua.h")
-endif ()
-
-if (NOT LUA_VERSION_STRING)
-    foreach (subdir IN LISTS _lua_include_subdirs)
-        unset(LUA_INCLUDE_PREFIX CACHE)
-        find_path(LUA_INCLUDE_PREFIX ${subdir}/lua.h
-          HINTS
-            ENV LUA_DIR
-          PATHS
-          ~/Library/Frameworks
-          /Library/Frameworks
-          /sw # Fink
-          /opt/local # DarwinPorts
-          /opt/csw # Blastwave
-          /opt
-        )
-        if (LUA_INCLUDE_PREFIX)
-            _lua_check_header_version("${LUA_INCLUDE_PREFIX}/${subdir}/lua.h")
-            if (LUA_VERSION_STRING)
-                set(LUA_INCLUDE_DIR "${LUA_INCLUDE_PREFIX}/${subdir}")
-                break()
-            endif ()
-        endif ()
-    endforeach ()
-endif ()
-unset(_lua_include_subdirs)
-unset(_lua_append_versions)
-
-if (LUA_VERSION_STRING)
-    set(_lua_library_names
-        lua${LUA_VERSION_MAJOR}${LUA_VERSION_MINOR}
-        lua${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}
-        lua-${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}
-        lua.${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}
-    )
-endif ()
-
-find_library(LUA_LIBRARY
-  NAMES ${_lua_library_names} lua
-  HINTS
-    ENV LUA_DIR
-  PATH_SUFFIXES lib
-  PATHS
-  ~/Library/Frameworks
-  /Library/Frameworks
-  /sw
-  /opt/local
-  /opt/csw
-  /opt
-)
-unset(_lua_library_names)
-
-if (LUA_LIBRARY)
-    # include the math library for Unix
-    if (UNIX AND NOT APPLE AND NOT BEOS)
-        find_library(LUA_MATH_LIBRARY m)
-        set(LUA_LIBRARIES "${LUA_LIBRARY};${LUA_MATH_LIBRARY}")
-
-        # include dl library for statically-linked Lua library
-        get_filename_component(LUA_LIB_EXT ${LUA_LIBRARY} EXT)
-        if(LUA_LIB_EXT STREQUAL CMAKE_STATIC_LIBRARY_SUFFIX)
-          list(APPEND LUA_LIBRARIES ${CMAKE_DL_LIBS})
-        endif()
-
-    # For Windows and Mac, don't need to explicitly include the math library
-    else ()
-        set(LUA_LIBRARIES "${LUA_LIBRARY}")
-    endif ()
-endif ()
-
-include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
-# handle the QUIETLY and REQUIRED arguments and set LUA_FOUND to TRUE if
-# all listed variables are TRUE
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Lua
-                                  REQUIRED_VARS LUA_LIBRARIES LUA_INCLUDE_DIR
-                                  VERSION_VAR LUA_VERSION_STRING)
-
-mark_as_advanced(LUA_INCLUDE_DIR LUA_LIBRARY LUA_MATH_LIBRARY)
diff --git a/devel/cmake/patches/patch-Modules_CMakeDetermineJavaCompiler_cmake 
b/devel/cmake/patches/patch-Modules_CMakeDetermineJavaCompiler_cmake
deleted file mode 100644
index 4974234fcc0..00000000000
--- a/devel/cmake/patches/patch-Modules_CMakeDetermineJavaCompiler_cmake
+++ /dev/null
@@ -1,71 +0,0 @@
-$OpenBSD: patch-Modules_CMakeDetermineJavaCompiler_cmake,v 1.15 2020/01/11 
08:01:09 rsadowski Exp $
-Index: Modules/CMakeDetermineJavaCompiler.cmake
---- Modules/CMakeDetermineJavaCompiler.cmake.orig
-+++ Modules/CMakeDetermineJavaCompiler.cmake
-@@ -6,6 +6,8 @@
- # NOTE, a generator may set CMAKE_Java_COMPILER before
- # loading this file to force a compiler.
- 
-+set(MODJAVA_VER $ENV{MODJAVA_VER})
-+
- if(NOT CMAKE_Java_COMPILER)
-   # prefer the environment variable CC
-   if(NOT $ENV{JAVA_COMPILER} STREQUAL "")
-@@ -32,30 +34,33 @@ if(NOT CMAKE_Java_COMPILER)
-     endif()
-   endif()
- 
--  set(Java_BIN_PATH
--    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development 
Kit\\2.0;JavaHome]/bin"
--    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development 
Kit\\1.9;JavaHome]/bin"
--    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development 
Kit\\1.8;JavaHome]/bin"
--    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development 
Kit\\1.7;JavaHome]/bin"
--    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development 
Kit\\1.6;JavaHome]/bin"
--    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development 
Kit\\1.5;JavaHome]/bin"
--    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development 
Kit\\1.4;JavaHome]/bin"
--    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development 
Kit\\1.3;JavaHome]/bin"
--    $ENV{JAVA_HOME}/bin
--    /usr/bin
--    /usr/lib/java/bin
--    /usr/share/java/bin
--    /usr/local/bin
--    /usr/local/java/bin
--    /usr/local/java/share/bin
--    /usr/java/j2sdk1.4.2_04
--    /usr/lib/j2sdk1.4-sun/bin
--    /usr/java/j2sdk1.4.2_09/bin
--    /usr/lib/j2sdk1.5-sun/bin
--    /opt/sun-jdk-1.5.0.04/bin
--    /usr/local/jdk-1.7.0/bin
--    /usr/local/jdk-1.6.0/bin
--    )
-+  if(MODJAVA_VER)
-+    set(Java_BIN_PATH /usr/local/jdk-1.8.0/bin)
-+  else(MODJAVA_VER)
-+    set(Java_BIN_PATH
-+      "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development 
Kit\\2.0;JavaHome]/bin"
-+      "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development 
Kit\\1.9;JavaHome]/bin"
-+      "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development 
Kit\\1.8;JavaHome]/bin"
-+      "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development 
Kit\\1.7;JavaHome]/bin"
-+      "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development 
Kit\\1.6;JavaHome]/bin"
-+      "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development 
Kit\\1.5;JavaHome]/bin"
-+      "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development 
Kit\\1.4;JavaHome]/bin"
-+      "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development 
Kit\\1.3;JavaHome]/bin"
-+      $ENV{JAVA_HOME}/bin
-+      /usr/bin
-+      /usr/lib/java/bin
-+      /usr/share/java/bin
-+      /usr/local/bin
-+      /usr/local/java/bin
-+      /usr/local/java/share/bin
-+      /usr/java/j2sdk1.4.2_04
-+      /usr/lib/j2sdk1.4-sun/bin
-+      /usr/java/j2sdk1.4.2_09/bin
-+      /usr/lib/j2sdk1.5-sun/bin
-+      /opt/sun-jdk-1.5.0.04/bin
-+      /usr/local/jdk-1.8.0/bin
-+      )
-+  endif(MODJAVA_VER)
-   # if no compiler has been specified yet, then look for one
-   if(CMAKE_Java_COMPILER_INIT)
-     set(CMAKE_Java_COMPILER ${CMAKE_Java_COMPILER_INIT} CACHE PATH "Java 
Compiler")
diff --git a/devel/cmake/patches/patch-Modules_FindJNI_cmake 
b/devel/cmake/patches/patch-Modules_FindJNI_cmake
deleted file mode 100644
index 5d00ce58196..00000000000
--- a/devel/cmake/patches/patch-Modules_FindJNI_cmake
+++ /dev/null
@@ -1,120 +0,0 @@
-$OpenBSD: patch-Modules_FindJNI_cmake,v 1.25 2020/01/11 08:01:09 rsadowski Exp 
$
-Index: Modules/FindJNI.cmake
---- Modules/FindJNI.cmake.orig
-+++ Modules/FindJNI.cmake
-@@ -45,6 +45,8 @@ The following cache variables are also available to se
-   the include path to jawt.h
- #]=======================================================================]
- 
-+set(MODJAVA_VER $ENV{MODJAVA_VER})
-+
- # Expand {libarch} occurrences to java_libarch subdirectory(-ies) and set 
${_var}
- macro(java_append_library_directories _var)
-     # Determine java arch-specific library subdir
-@@ -93,8 +95,10 @@ macro(java_append_library_directories _var)
- 
-     # Append default list architectures if CMAKE_SYSTEM_PROCESSOR was empty or
-     # system is non-Linux (where the code above has not been well tested)
--    if(NOT _java_libarch OR NOT (CMAKE_SYSTEM_NAME MATCHES "Linux"))
--        list(APPEND _java_libarch "i386" "amd64" "ppc")
-+    if(NOT MODJAVA_VER)
-+      if(NOT _java_libarch OR NOT (CMAKE_SYSTEM_NAME MATCHES "Linux"))
-+          list(APPEND _java_libarch "i386" "amd64" "ppc")
-+      endif()
-     endif()
- 
-     # Sometimes ${CMAKE_SYSTEM_PROCESSOR} is added to the list to prefer
-@@ -130,17 +134,71 @@ if(_JAVA_HOME_EXPLICIT)
-   set(CMAKE_FIND_FRAMEWORK NEVER)
- endif()
- 
--set(JAVA_AWT_LIBRARY_DIRECTORIES)
--if(_JAVA_HOME)
-+if(MODJAVA_VER)
-+  set(JAVA_AWT_LIBRARY_DIRECTORIES)
-   JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_LIBRARY_DIRECTORIES
--    ${_JAVA_HOME}/jre/lib/{libarch}
--    ${_JAVA_HOME}/jre/lib
--    ${_JAVA_HOME}/lib/{libarch}
--    ${_JAVA_HOME}/lib
--    ${_JAVA_HOME}
-+    ${LOCALBASE}/jdk-1.8.0/jre/lib/{libarch}
-+    ${LOCALBASE}/jre-1.8.0/lib/{libarch}
-+    ${LOCALBASE}/jdk-11/jre/lib/{libarch}
-+    ${LOCALBASE}/jre-11/lib/{libarch}
-     )
-+else(MODJAVA_VER)
-+  set(JAVA_AWT_LIBRARY_DIRECTORIES)
-+  if(_JAVA_HOME)
-+    JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_LIBRARY_DIRECTORIES
-+      ${_JAVA_HOME}/jre/lib/{libarch}
-+      ${_JAVA_HOME}/jre/lib
-+      ${_JAVA_HOME}/lib/{libarch}
-+      ${_JAVA_HOME}/lib
-+      ${_JAVA_HOME}
-+      )
- endif()
-+list(APPEND JAVA_AWT_LIBRARY_DIRECTORIES
-+  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development 
Kit\\1.4;JavaHome]/lib"
-+  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development 
Kit\\1.3;JavaHome]/lib"
-+  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development 
Kit\\${java_install_version};JavaHome]/lib"
-+  )
-+JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_LIBRARY_DIRECTORIES
-+  /usr/lib
-+  /usr/local/lib
-+  /usr/lib/jvm/java/lib
-+  /usr/lib/java/jre/lib/{libarch}
-+  /usr/lib/jvm/jre/lib/{libarch}
-+  /usr/local/lib/java/jre/lib/{libarch}
-+  /usr/local/share/java/jre/lib/{libarch}
-+  /usr/lib/j2sdk1.4-sun/jre/lib/{libarch}
-+  /usr/lib/j2sdk1.5-sun/jre/lib/{libarch}
-+  /opt/sun-jdk-1.5.0.04/jre/lib/{libarch}
-+  /usr/lib/jvm/java-6-sun/jre/lib/{libarch}
-+  /usr/lib/jvm/java-1.5.0-sun/jre/lib/{libarch}
-+  /usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/{libarch}       # can this one be 
removed ac
-+  /usr/lib/jvm/java-6-openjdk/jre/lib/{libarch}
-+  /usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0/jre/lib/{libarch}        # fedora
-+  # Debian specific paths for default JVM
-+  /usr/lib/jvm/default-java/jre/lib/{libarch}
-+  /usr/lib/jvm/default-java/jre/lib
-+  /usr/lib/jvm/default-java/lib
-+  # Arch Linux specific paths for default JVM
-+  /usr/lib/jvm/default/jre/lib/{libarch}
-+  /usr/lib/jvm/default/lib/{libarch}
-+  # Ubuntu specific paths for default JVM
-+  /usr/lib/jvm/java-8-openjdk-{libarch}/jre/lib/{libarch}     # Ubuntu 15.10
-+  /usr/lib/jvm/java-7-openjdk-{libarch}/jre/lib/{libarch}     # Ubuntu 15.10
-+  /usr/lib/jvm/java-6-openjdk-{libarch}/jre/lib/{libarch}     # Ubuntu 15.10
-+  # OpenBSD specific paths for default JVM
-+  ${LOCALBASE}/jdk-1.8.0/jre/lib/{libarch}
-+  ${LOCALBASE}/jre-1.8.0/lib/{libarch}
-+  ${LOCALBASE}/jdk-11/jre/lib/{libarch}
-+  ${LOCALBASE}/jre-11/lib/{libarch}
-+  # SuSE specific paths for default JVM
-+  /usr/lib64/jvm/java/jre/lib/{libarch}
-+  /usr/lib64/jvm/jre/lib/{libarch}
-+  )
-+endif(MODJAVA_VER)
- 
-+get_filename_component(java_install_version
-+  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development 
Kit;CurrentVersion]" NAME)
-+
- if (WIN32)
-   set (_JNI_HINTS)
-   execute_process(COMMAND REG QUERY HKLM\\SOFTWARE\\JavaSoft\\JDK
-@@ -209,10 +267,10 @@ set(_JNI_JAVA_DIRECTORIES_BASE
-   /usr/lib/jvm/java-7-openjdk-{libarch}     # Ubuntu 15.10
-   /usr/lib/jvm/java-6-openjdk-{libarch}     # Ubuntu 15.10
-   # OpenBSD specific paths for default JVM
--  /usr/local/jdk-1.7.0
--  /usr/local/jre-1.7.0
--  /usr/local/jdk-1.6.0
--  /usr/local/jre-1.6.0
-+  ${LOCALBASE}/jdk-1.8.0
-+  ${LOCALBASE}/jre-1.8.0
-+  ${LOCALBASE}/jdk-11
-+  ${LOCALBASE}/jre-11
-   # SuSE specific paths for default JVM
-   /usr/lib64/jvm/java
-   /usr/lib64/jvm/jre
diff --git a/devel/cmake/patches/patch-Modules_FindJava_cmake 
b/devel/cmake/patches/patch-Modules_FindJava_cmake
deleted file mode 100644
index a6638764df6..00000000000
--- a/devel/cmake/patches/patch-Modules_FindJava_cmake
+++ /dev/null
@@ -1,49 +0,0 @@
-$OpenBSD: patch-Modules_FindJava_cmake,v 1.25 2019/08/21 05:47:40 rsadowski 
Exp $
-Index: Modules/FindJava.cmake
---- Modules/FindJava.cmake.orig
-+++ Modules/FindJava.cmake
-@@ -78,6 +78,8 @@ Example Usages:
- 
- include(${CMAKE_CURRENT_LIST_DIR}/CMakeFindJavaCommon.cmake)
- 
-+set(MODJAVA_VER $ENV{MODJAVA_VER})
-+
- # The HINTS option should only be used for values computed from the system.
- set(_JAVA_HINTS)
- if(_JAVA_HOME)
-@@ -133,19 +135,22 @@ endif()
- 
- # Hard-coded guesses should still go in PATHS. This ensures that the user
- # environment can always override hard guesses.
--set(_JAVA_PATHS
--  /usr/lib/java/bin
--  /usr/share/java/bin
--  /usr/local/java/bin
--  /usr/local/java/share/bin
--  /usr/java/j2sdk1.4.2_04
--  /usr/lib/j2sdk1.4-sun/bin
--  /usr/java/j2sdk1.4.2_09/bin
--  /usr/lib/j2sdk1.5-sun/bin
--  /opt/sun-jdk-1.5.0.04/bin
--  /usr/local/jdk-1.7.0/bin
--  /usr/local/jdk-1.6.0/bin
--  )
-+if(MODJAVA_VER)
-+  set(_JAVA_PATHS ${LOCALBASE}/jdk-1.8.0/bin)
-+else(MODJAVA_VER)
-+  set(_JAVA_PATHS
-+    /usr/lib/java/bin
-+    /usr/share/java/bin
-+    /usr/local/java/bin
-+    /usr/local/java/share/bin
-+    /usr/java/j2sdk1.4.2_04
-+    /usr/lib/j2sdk1.4-sun/bin
-+    /usr/java/j2sdk1.4.2_09/bin
-+    /usr/lib/j2sdk1.5-sun/bin
-+    /opt/sun-jdk-1.5.0.04/bin
-+    ${LOCALBASE}/jdk-1.8.0/bin
-+    )
-+endif(MODJAVA_VER)
- find_program(Java_JAVA_EXECUTABLE
-   NAMES java
-   HINTS ${_JAVA_HINTS}
diff --git a/devel/cmake/patches/patch-Modules_FindLua_cmake 
b/devel/cmake/patches/patch-Modules_FindLua_cmake
deleted file mode 100644
index ac9ef473c16..00000000000
--- a/devel/cmake/patches/patch-Modules_FindLua_cmake
+++ /dev/null
@@ -1,33 +0,0 @@
-$OpenBSD: patch-Modules_FindLua_cmake,v 1.7 2019/08/21 05:47:40 rsadowski Exp $
-
-Index: Modules/FindLua.cmake
---- Modules/FindLua.cmake.orig
-+++ Modules/FindLua.cmake
-@@ -46,9 +46,16 @@ unset(_lua_include_subdirs)
- unset(_lua_library_names)
- unset(_lua_append_versions)
- 
-+set(MODLUA_VERSION $ENV{MODLUA_VERSION})
-+set(MODLUA_INCL_DIR $ENV{MODLUA_INCL_DIR})
-+
- # this is a function only to have all the variables inside go away 
automatically
- function(_lua_get_versions)
--    set(LUA_VERSIONS5 5.3 5.2 5.1 5.0)
-+    if(MODLUA_VERSION)
-+         set(LUA_VERSIONS5 ${MODLUA_VERSION})
-+    else()
-+         set(LUA_VERSIONS5 5.3 5.2 5.1 5.0)
-+    endif()
- 
-     if (Lua_FIND_VERSION_EXACT)
-         if (Lua_FIND_VERSION_COUNT GREATER 1)
-@@ -145,6 +152,9 @@ endfunction(_lua_get_header_version)
- 
- function(_lua_find_header)
-   _lua_set_version_vars()
-+  if(MODLUA_INCL_DIR)
-+      set(LUA_INCLUDE_DIR "${MODLUA_INCL_DIR}")
-+  endif()
- 
-   # Initialize as local variable
-   set(CMAKE_IGNORE_PATH ${CMAKE_IGNORE_PATH})
diff --git a/devel/cmake/patches/patch-Modules_FindOpenMP_cmake 
b/devel/cmake/patches/patch-Modules_FindOpenMP_cmake
index c5267dc2e51..0969ff5c57f 100644
--- a/devel/cmake/patches/patch-Modules_FindOpenMP_cmake
+++ b/devel/cmake/patches/patch-Modules_FindOpenMP_cmake
@@ -10,7 +10,7 @@ Index: Modules/FindOpenMP.cmake
      unset(OpenMP_FLAG_CANDIDATES)
  
 -    set(OMP_FLAG_GNU "-fopenmp")
--    set(OMP_FLAG_Clang "-fopenmp=libomp" "-fopenmp=libiomp5" "-fopenmp")
+-    set(OMP_FLAG_Clang "-fopenmp=libomp" "-fopenmp=libiomp5" "-fopenmp" 
"-Xclang -fopenmp")
 +    set(OMP_FLAG_GNU "-fopenmp -lgomp")
 +    set(OMP_FLAG_Clang "-fopenmp -I${LOCALBASE}/include 
-Wl,-L${LOCALBASE}/lib,-lomp")
      set(OMP_FLAG_AppleClang "-Xclang -fopenmp")
diff --git a/devel/cmake/patches/patch-Modules_FindPythonInterp_cmake 
b/devel/cmake/patches/patch-Modules_FindPythonInterp_cmake
deleted file mode 100644
index 65fdcdb19b6..00000000000
--- a/devel/cmake/patches/patch-Modules_FindPythonInterp_cmake
+++ /dev/null
@@ -1,50 +0,0 @@
-$OpenBSD: patch-Modules_FindPythonInterp_cmake,v 1.13 2020/01/11 08:01:09 
rsadowski Exp $
-Index: Modules/FindPythonInterp.cmake
---- Modules/FindPythonInterp.cmake.orig
-+++ Modules/FindPythonInterp.cmake
-@@ -50,6 +50,8 @@ of PYTHON_LIBRARIES.
- 
- #]=======================================================================]
- 
-+set(MODPY_VERSION $ENV{MODPY_VERSION})
-+
- unset(_Python_NAMES)
- 
- set(_PYTHON1_VERSIONS 1.6 1.5)
-@@ -82,19 +84,23 @@ find_program(PYTHON_EXECUTABLE NAMES ${_Python_NAMES})
- 
- # Set up the versions we know about, in the order we will search. Always add
- # the user supplied additional versions to the front.
--set(_Python_VERSIONS ${Python_ADDITIONAL_VERSIONS})
--# If FindPythonInterp has already found the major and minor version,
--# insert that version next to get consistent versions of the interpreter and
--# library.
--if(DEFINED PYTHONLIBS_VERSION_STRING)
--  string(REPLACE "." ";" _PYTHONLIBS_VERSION "${PYTHONLIBS_VERSION_STRING}")
--  list(GET _PYTHONLIBS_VERSION 0 _PYTHONLIBS_VERSION_MAJOR)
--  list(GET _PYTHONLIBS_VERSION 1 _PYTHONLIBS_VERSION_MINOR)
--  list(APPEND _Python_VERSIONS 
${_PYTHONLIBS_VERSION_MAJOR}.${_PYTHONLIBS_VERSION_MINOR})
--endif()
--# Search for the current active python version first
--list(APPEND _Python_VERSIONS ";")
--list(APPEND _Python_VERSIONS ${_PYTHON_FIND_OTHER_VERSIONS})
-+if(MODPY_VERSION)
-+  set(_Python_VERSIONS ${MODPY_VERSION})
-+else(MODPY_VERSION)
-+  set(_Python_VERSIONS ${Python_ADDITIONAL_VERSIONS})
-+  # If FindPythonInterp has already found the major and minor version,
-+  # insert that version next to get consistent versions of the interpreter and
-+  # library.
-+  if(DEFINED PYTHONLIBS_VERSION_STRING)
-+    string(REPLACE "." ";" _PYTHONLIBS_VERSION "${PYTHONLIBS_VERSION_STRING}")
-+    list(GET _PYTHONLIBS_VERSION 0 _PYTHONLIBS_VERSION_MAJOR)
-+    list(GET _PYTHONLIBS_VERSION 1 _PYTHONLIBS_VERSION_MINOR)
-+    list(APPEND _Python_VERSIONS 
${_PYTHONLIBS_VERSION_MAJOR}.${_PYTHONLIBS_VERSION_MINOR})
-+  endif()
-+  # Search for the current active python version first
-+  list(APPEND _Python_VERSIONS ";")
-+  list(APPEND _Python_VERSIONS ${_PYTHON_FIND_OTHER_VERSIONS})
-+endif(MODPY_VERSION)
- 
- unset(_PYTHON_FIND_OTHER_VERSIONS)
- unset(_PYTHON1_VERSIONS)
diff --git a/devel/cmake/patches/patch-Modules_FindPythonLibs_cmake 
b/devel/cmake/patches/patch-Modules_FindPythonLibs_cmake
deleted file mode 100644
index 57d09c562bf..00000000000
--- a/devel/cmake/patches/patch-Modules_FindPythonLibs_cmake
+++ /dev/null
@@ -1,88 +0,0 @@
-$OpenBSD: patch-Modules_FindPythonLibs_cmake,v 1.19 2020/01/11 08:01:09 
rsadowski Exp $
-Index: Modules/FindPythonLibs.cmake
---- Modules/FindPythonLibs.cmake.orig
-+++ Modules/FindPythonLibs.cmake
-@@ -77,6 +77,9 @@ endif()
- # To avoid picking up the system Python.h pre-maturely.
- set(CMAKE_FIND_FRAMEWORK LAST)
- 
-+set(MODPY_VERSION $ENV{MODPY_VERSION})
-+set(MODPY_INCDIR $ENV{MODPY_INCDIR})
-+
- set(_PYTHON1_VERSIONS 1.6 1.5)
- set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0)
- set(_PYTHON3_VERSIONS 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
-@@ -111,11 +114,15 @@ endif()
- # If FindPythonInterp has already found the major and minor version,
- # insert that version between the user supplied versions and the stock
- # version list.
--set(_Python_VERSIONS ${Python_ADDITIONAL_VERSIONS})
--if(DEFINED PYTHON_VERSION_MAJOR AND DEFINED PYTHON_VERSION_MINOR)
--  list(APPEND _Python_VERSIONS 
${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR})
--endif()
--list(APPEND _Python_VERSIONS ${_PYTHON_FIND_OTHER_VERSIONS})
-+if(MODPY_VERSION)
-+  set(_Python_VERSIONS ${MODPY_VERSION})
-+else(MODPY_VERSION)
-+  set(_Python_VERSIONS ${Python_ADDITIONAL_VERSIONS})
-+  if(DEFINED PYTHON_VERSION_MAJOR AND DEFINED PYTHON_VERSION_MINOR)
-+    list(APPEND _Python_VERSIONS 
${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR})
-+  endif()
-+  list(APPEND _Python_VERSIONS ${_PYTHON_FIND_OTHER_VERSIONS})
-+endif(MODPY_VERSION)
- 
- unset(_PYTHON_FIND_OTHER_VERSIONS)
- unset(_PYTHON1_VERSIONS)
-@@ -234,25 +241,24 @@ foreach(_CURRENT_VERSION ${_Python_VERSIONS})
-           ${dir}/Versions/${_CURRENT_VERSION}/include)
-       endforeach()
-     endif()
--
--    find_path(PYTHON_INCLUDE_DIR
--      NAMES Python.h
--      HINTS
--        ${_Python_INCLUDE_PATH_HINT}
--      PATHS
--        ${PYTHON_FRAMEWORK_INCLUDES}
--        
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/include
--        
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}-${_PYTHON_ARCH}\\InstallPath]/include
--        
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}-${_PYTHON_ARCH2}\\InstallPath]/include
--        
[HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/include
--        
[HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}-${_PYTHON_ARCH}\\InstallPath]/include
--        
[HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}-${_PYTHON_ARCH2}\\InstallPath]/include
--      PATH_SUFFIXES
--        python${_CURRENT_VERSION}mu
--        python${_CURRENT_VERSION}m
--        python${_CURRENT_VERSION}u
--        python${_CURRENT_VERSION}
--    )
-+    if(MODPY_VERSION AND MODPY_INCDIR)
-+      set(PYTHON_INCLUDE_DIR "${MODPY_INCDIR}")
-+    else(MODPY_VERSION AND MODPY_INCDIR)
-+      find_path(PYTHON_INCLUDE_DIR
-+        NAMES Python.h
-+        HINTS
-+          ${_Python_INCLUDE_PATH_HINT}
-+        PATHS
-+          ${PYTHON_FRAMEWORK_INCLUDES}
-+          
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/include
-+          
[HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/include
-+        PATH_SUFFIXES
-+          python${_CURRENT_VERSION}mu
-+          python${_CURRENT_VERSION}m
-+          python${_CURRENT_VERSION}u
-+          python${_CURRENT_VERSION}
-+      )
-+    endif(MODPY_VERSION AND MODPY_INCDIR)
-   endif()
- 
-   # For backward compatibility, set PYTHON_INCLUDE_PATH.
-@@ -293,7 +299,7 @@ set(PYTHON_LIBRARY_DEBUG "${PYTHON_DEBUG_LIBRARY}")
- set(PYTHON_LIBRARY_RELEASE "${PYTHON_LIBRARY}")
- include(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake)
- SELECT_LIBRARY_CONFIGURATIONS(PYTHON)
--# SELECT_LIBRARY_CONFIGURATIONS() sets ${PREFIX}_FOUND if it has a library.
-+# SELECT_LIBRARY_CONFIGURATIONS() sets /usr/local_FOUND if it has a library.
- # Unset this, this prefix doesn't match the module prefix, they are different
- # for historical reasons.
- unset(PYTHON_FOUND)
diff --git a/devel/cmake/patches/patch-Modules_FindRuby_cmake 
b/devel/cmake/patches/patch-Modules_FindRuby_cmake
deleted file mode 100644
index e2e18373b2b..00000000000
--- a/devel/cmake/patches/patch-Modules_FindRuby_cmake
+++ /dev/null
@@ -1,82 +0,0 @@
-$OpenBSD: patch-Modules_FindRuby_cmake,v 1.17 2019/08/21 05:47:40 rsadowski 
Exp $
-
-Index: Modules/FindRuby.cmake
---- Modules/FindRuby.cmake.orig
-+++ Modules/FindRuby.cmake
-@@ -42,7 +42,17 @@ Also:
- 
- # uncomment the following line to get debug output for this file
- # set(_RUBY_DEBUG_OUTPUT TRUE)
-+set(MODRUBY_REV $ENV{MODRUBY_REV})
- 
-+if(MODRUBY_REV AND MODRUBY_REV MATCHES "^[0-9]+\\.[0-9]$")
-+   string(REPLACE "." "" MODRUBY_REV_NO_DOTS ${MODRUBY_REV})
-+   string(REPLACE "." ";" MODRUBY_REV_LIST ${MODRUBY_REV})
-+   list(GET MODRUBY_REV_LIST 0 MODRUBY_REV_MAJOR)
-+   list(GET MODRUBY_REV_LIST 1 MODRUBY_REV_MINOR)
-+endif()
-+
-+
-+
- # Determine the list of possible names of the ruby executable depending
- # on which version of ruby is required
- set(_RUBY_POSSIBLE_EXECUTABLE_NAMES ruby)
-@@ -60,12 +70,16 @@ else()
- endif()
- 
- if(NOT Ruby_FIND_VERSION_EXACT)
--  list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby2.4 ruby24)
--  list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby2.3 ruby23)
--  list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby2.2 ruby22)
--  list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby2.1 ruby21)
--  list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby2.0 ruby20)
--  list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby1.9 ruby19)
-+  list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby28 ruby2.8)
-+  list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby27 ruby2.7)
-+  list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby26 ruby2.6)
-+  list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby25 ruby2.5)
-+  list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby24 ruby2.4)
-+  list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby23 ruby2.3)
-+  list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby22 ruby2.2)
-+  list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby21 ruby2.1)
-+  list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby20 ruby2.0)
-+  list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby19 ruby1.9)
- 
-   # if we want a version below 1.9, also look for ruby 1.8
-   if("${Ruby_FIND_VERSION_SHORT_NODOT}" VERSION_LESS "19")
-@@ -189,6 +203,26 @@ if(RUBY_EXECUTABLE AND NOT RUBY_VERSION_MAJOR)
-     set(RUBY_VERSION_MAJOR 2)
-     set(RUBY_VERSION_MINOR 4)
-   endif()
-+  # check whether we found 2.5.x
-+  if(${RUBY_EXECUTABLE} MATCHES "ruby2\\.?5")
-+    set(RUBY_VERSION_MAJOR 2)
-+    set(RUBY_VERSION_MINOR 5)
-+  endif()
-+  # check whether we found 2.6.x
-+  if(${RUBY_EXECUTABLE} MATCHES "ruby2\\.?6")
-+    set(RUBY_VERSION_MAJOR 2)
-+    set(RUBY_VERSION_MINOR 6)
-+  endif()
-+  # check whether we found 2.7.x
-+  if(${RUBY_EXECUTABLE} MATCHES "ruby2\\.?7")
-+    set(RUBY_VERSION_MAJOR 2)
-+    set(RUBY_VERSION_MINOR 7)
-+  endif()
-+  # check whether we found 2.8.x
-+  if(${RUBY_EXECUTABLE} MATCHES "ruby2\\.?8")
-+    set(RUBY_VERSION_MAJOR 2)
-+    set(RUBY_VERSION_MINOR 8)
-+  endif()
- endif()
- 
- if(RUBY_VERSION_MAJOR)
-@@ -223,7 +257,7 @@ endif()
- 
- 
- # Determine the list of possible names for the ruby library
--set(_RUBY_POSSIBLE_LIB_NAMES ruby ruby-static ruby${_RUBY_VERSION_SHORT} 
ruby${_RUBY_VERSION_SHORT_NODOT} ruby-${_RUBY_VERSION_SHORT} 
ruby-${RUBY_VERSION})
-+set(_RUBY_POSSIBLE_LIB_NAMES ruby${_RUBY_VERSION_SHORT_NODOT} 
ruby${_RUBY_VERSION_SHORT} ruby-${_RUBY_VERSION_SHORT} ruby-${RUBY_VERSION} 
ruby ruby-static)
- 
- if(WIN32)
-   set( _RUBY_MSVC_RUNTIME "" )
diff --git a/devel/cmake/patches/patch-Modules_Platform_OpenBSD_cmake 
b/devel/cmake/patches/patch-Modules_Platform_OpenBSD_cmake
new file mode 100644
index 00000000000..2672560a4a7
--- /dev/null
+++ b/devel/cmake/patches/patch-Modules_Platform_OpenBSD_cmake
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+Index: Modules/Platform/OpenBSD.cmake
+--- Modules/Platform/OpenBSD.cmake.orig
++++ Modules/Platform/OpenBSD.cmake
+@@ -40,4 +40,9 @@ else()
+   set(OPENBSD_X11BASE /usr/X11R6)
+ endif()
+ 
++# If DEBUG_PACKAGES set don't create install stripa rule
++if($ENV{DEBUG_PACKAGES})
++  set(CMAKE_OPENBSD_DEBUG_PACKAGES)
++endif()
++
+ list(APPEND CMAKE_SYSTEM_PREFIX_PATH ${OPENBSD_LOCALBASE})
diff --git a/devel/cmake/patches/patch-Modules_Qt4ConfigDependentSettings_cmake 
b/devel/cmake/patches/patch-Modules_Qt4ConfigDependentSettings_cmake
deleted file mode 100644
index 94051e28e4a..00000000000
--- a/devel/cmake/patches/patch-Modules_Qt4ConfigDependentSettings_cmake
+++ /dev/null
@@ -1,66 +0,0 @@
-$OpenBSD: patch-Modules_Qt4ConfigDependentSettings_cmake,v 1.12 2019/08/21 
05:47:40 rsadowski Exp $
-Index: Modules/Qt4ConfigDependentSettings.cmake
---- Modules/Qt4ConfigDependentSettings.cmake.orig
-+++ Modules/Qt4ConfigDependentSettings.cmake
-@@ -22,6 +22,10 @@ This file is included by FindQt4.cmake, don't include 
- # if a user needs the dependencies, and they couldn't be found, they can set
- # the variables themselves.
- 
-+include(FindIconv)
-+include(FindIntl)
-+include(FindLCMS)
-+
- set(QT_QTGUI_LIB_DEPENDENCIES "")
- set(QT_QTCORE_LIB_DEPENDENCIES "")
- set(QT_QTNETWORK_LIB_DEPENDENCIES "")
-@@ -56,10 +60,6 @@ if(Q_WS_WIN  AND  NOT QT_IS_STATIC)
-   set(QT_DEFINITIONS ${QT_DEFINITIONS} -DQT_DLL)
- endif()
- 
--if(NOT QT_IS_STATIC)
--  return()
--endif()
--
- # QtOpenGL dependencies
- find_package(OpenGL)
- set (QT_QTOPENGL_LIB_DEPENDENCIES ${OPENGL_glu_LIBRARY} ${OPENGL_gl_LIBRARY})
-@@ -89,6 +89,15 @@ if(QT_QCONFIG MATCHES "system-mng")
-   set(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${MNG_LIBRARY})
- endif()
- 
-+## system lcms
-+if(LCMS_FOUND)
-+  find_library(LCMS_LIBRARY NAMES lcms)
-+  mark_as_advanced(LCMS_LIBRARY)
-+  if(LCMS_LIBRARY)
-+    set(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} 
${LCMS_LIBRARY})
-+  endif(LCMS_LIBRARY)
-+endif(LCMS_FOUND)
-+
- # for X11, get X11 library directory
- if(Q_WS_X11)
-   find_package(X11)
-@@ -176,6 +185,23 @@ if(QT_QCONFIG MATCHES "system-zlib")
-   set(QT_QTCORE_LIB_DEPENDENCIES ${QT_QTCORE_LIB_DEPENDENCIES} 
${ZLIB_LIBRARIES})
- endif()
- 
-+## iconv
-+if(ICONV_FOUND)
-+  find_library(QT_ICONV_LIBRARY NAMES iconv)
-+  mark_as_advanced(QT_ICONV_LIBRARY)
-+  if(QT_ICONV_LIBRARY)
-+    set(QT_QTCORE_LIB_DEPENDENCIES ${QT_QTCORE_LIB_DEPENDENCIES} 
${QT_ICONV_LIBRARY})
-+  endif(QT_ICONV_LIBRARY)
-+endif(ICONV_FOUND)
-+
-+## libintl
-+if(Intl_FOUND)
-+  find_library(QT_INTL_LIBRARY NAMES intl)
-+  mark_as_advanced(QT_INTL_LIBRARY)
-+  if(QT_INTL_LIBRARY)
-+    set(QT_QTCORE_LIB_DEPENDENCIES ${QT_QTCORE_LIB_DEPENDENCIES} 
${QT_INTL_LIBRARY})
-+  endif(QT_INTL_LIBRARY)
-+endif(Intl_FOUND)
- 
- ## openssl
- if(NOT Q_WS_WIN)
diff --git a/devel/cmake/patches/patch-Source_cmArchiveWrite_cxx 
b/devel/cmake/patches/patch-Source_cmArchiveWrite_cxx
index 7091b6f7af6..c24198382e0 100644
--- a/devel/cmake/patches/patch-Source_cmArchiveWrite_cxx
+++ b/devel/cmake/patches/patch-Source_cmArchiveWrite_cxx
@@ -29,7 +29,7 @@ the invalid use of the interface.
 Index: Source/cmArchiveWrite.cxx
 --- Source/cmArchiveWrite.cxx.orig
 +++ Source/cmArchiveWrite.cxx
-@@ -236,9 +236,6 @@ bool cmArchiveWrite::AddFile(const char* file, size_t 
+@@ -242,9 +242,6 @@ bool cmArchiveWrite::AddFile(const char* file, size_t 
    }
    const char* out = file + skip;
  
diff --git a/devel/cmake/patches/patch-Source_cmComputeLinkInformation_cxx 
b/devel/cmake/patches/patch-Source_cmComputeLinkInformation_cxx
index 714d6e1280e..b915c2aaf7c 100644
--- a/devel/cmake/patches/patch-Source_cmComputeLinkInformation_cxx
+++ b/devel/cmake/patches/patch-Source_cmComputeLinkInformation_cxx
@@ -2,7 +2,7 @@ $OpenBSD: patch-Source_cmComputeLinkInformation_cxx,v 1.24 
2020/01/11 08:01:09 r
 Index: Source/cmComputeLinkInformation.cxx
 --- Source/cmComputeLinkInformation.cxx.orig
 +++ Source/cmComputeLinkInformation.cxx
-@@ -369,8 +369,9 @@ cmComputeLinkInformation::cmComputeLinkInformation(
+@@ -371,8 +371,9 @@ cmComputeLinkInformation::cmComputeLinkInformation(
    this->OrderRuntimeSearchPath->AddUserDirectories(directories);
  
    // Set up the implicit link directories.
@@ -13,84 +13,84 @@ Index: Source/cmComputeLinkInformation.cxx
    
this->OrderRuntimeSearchPath->SetImplicitDirectories(this->ImplicitLinkDirs);
    if (this->OrderDependentRPath) {
      this->OrderDependentRPath->SetImplicitDirectories(this->ImplicitLinkDirs);
-@@ -485,6 +486,8 @@ cmComputeLinkInformation::GetSharedLibrariesLinked() c
+@@ -482,6 +483,7 @@ cmComputeLinkInformation::GetSharedLibrariesLinked() c
  
  bool cmComputeLinkInformation::Compute()
  {
 +  bool use_wxneeded = false;
-+
    // Skip targets that do not link.
    if (!(this->Target->GetType() == cmStateEnums::EXECUTABLE ||
          this->Target->GetType() == cmStateEnums::SHARED_LIBRARY ||
-@@ -511,10 +514,17 @@ bool cmComputeLinkInformation::Compute()
+@@ -508,10 +510,17 @@ bool cmComputeLinkInformation::Compute()
      if (linkEntry.IsSharedDep) {
        this->AddSharedDepItem(linkEntry.Item, linkEntry.Target);
      } else {
-+      std::string litem_tolower = linkEntry.Item;
++      std::string litem_tolower = linkEntry.Item.Value;
 +      transform(litem_tolower.begin(), litem_tolower.end(), 
litem_tolower.begin(), ::tolower);
 +      if (litem_tolower.find("webkit") != std::string::npos || 
litem_tolower.find("webengine") != std::string::npos)
-+        use_wxneeded = true;
++         use_wxneeded = true;
        this->AddItem(linkEntry.Item, linkEntry.Target);
      }
    }
  
 +  if (use_wxneeded == true)
-+    this->AddUserItem("-Wl,-z,wxneeded", false);
++    this->AddUserItem(std::string("-Wl,-z,wxneeded"), false);
 +
    // Restore the target link type so the correct system runtime
    // libraries are found.
    const char* lss = this->Target->GetProperty("LINK_SEARCH_END_STATIC");
-@@ -677,10 +687,16 @@ void cmComputeLinkInformation::AddItem(std::string con
+@@ -718,10 +727,16 @@ void cmComputeLinkInformation::AddItem(BT<std::string>
          // This is a directory.
-         this->AddDirectoryItem(item);
+         this->AddDirectoryItem(item.Value);
        } else {
 -        // Use the full path given to the library file.
-         this->Depends.push_back(item);
+         this->Depends.push_back(item.Value);
 -        this->AddFullItem(item);
--        this->AddLibraryRuntimeInfo(item);
+-        this->AddLibraryRuntimeInfo(item.Value);
 +        if (!this->OpenBSD) {
 +          // Use the full path given to the library file.
 +          this->AddFullItem(item);
-+          this->AddLibraryRuntimeInfo(item);
++          this->AddLibraryRuntimeInfo(item.Value);
 +        } else {
-+          std::string file = cmSystemTools::GetFilenameName(item);
++          std::string file = cmSystemTools::GetFilenameName(item.Value);
 +          this->AddUserItem(file, false);
-+          this->OrderLinkerSearchPath->AddLinkLibrary(item);
++          this->OrderLinkerSearchPath->AddLinkLibrary(item.Value);
 +        }
        }
      } else {
        // This is a library or option specified by the user.
-@@ -1012,11 +1028,18 @@ void cmComputeLinkInformation::AddTargetItem(std::stri
+@@ -1053,11 +1068,18 @@ void cmComputeLinkInformation::AddTargetItem(BT<std::s
      this->SharedLibrariesLinked.insert(target);
    }
  
 -  // Handle case of an imported shared library with no soname.
 -  if (this->NoSONameUsesPath &&
 -      target->IsImportedSharedLibWithoutSOName(this->Config)) {
--    this->AddSharedLibNoSOName(item);
+-    this->AddSharedLibNoSOName(item.Value);
 -    return;
 +  if (this->OpenBSD) {
 +    if (target->GetType() == cmStateEnums::SHARED_LIBRARY) {
-+      this->AddSharedLibNoSOName(item);
++      this->AddSharedLibNoSOName(item.Value);
 +      return;
 +    }
 +  } else {
 +    // Handle case of an imported shared library with no soname.
 +    if (this->NoSONameUsesPath &&
 +        target->IsImportedSharedLibWithoutSOName(this->Config)) {
-+      this->AddSharedLibNoSOName(item);
++      this->AddSharedLibNoSOName(item.Value);
 +      return;
 +    }
    }
  
    // For compatibility with CMake 2.4 include the item's directory in
-@@ -1575,6 +1598,27 @@ void cmComputeLinkInformation::LoadImplicitLinkInfo()
+@@ -1616,6 +1638,28 @@ void cmComputeLinkInformation::LoadImplicitLinkInfo()
    if (const char* rpathDirs =
          (this->Makefile->GetDefinition("CMAKE_PLATFORM_RUNTIME_PATH"))) {
      cmExpandList(rpathDirs, this->RuntimeLinkDirs);
 +  }
 +}
 +
++
 +void cmComputeLinkInformation::LoadImplicitLinkInfoOpenBSD()
 +{
 +  std::vector<std::string> implicitDirVec;
diff --git a/devel/cmake/patches/patch-Source_cmComputeLinkInformation_h 
b/devel/cmake/patches/patch-Source_cmComputeLinkInformation_h
index e58bb988700..de7b637553d 100644
--- a/devel/cmake/patches/patch-Source_cmComputeLinkInformation_h
+++ b/devel/cmake/patches/patch-Source_cmComputeLinkInformation_h
@@ -3,11 +3,11 @@ $OpenBSD: patch-Source_cmComputeLinkInformation_h,v 1.5 
2020/01/11 08:01:09 rsad
 Index: Source/cmComputeLinkInformation.h
 --- Source/cmComputeLinkInformation.h.orig
 +++ Source/cmComputeLinkInformation.h
-@@ -170,6 +170,7 @@ class cmComputeLinkInformation (private)
+@@ -176,6 +176,7 @@ class cmComputeLinkInformation (private)
  
    // Implicit link libraries and directories for linker language.
    void LoadImplicitLinkInfo();
 +  void LoadImplicitLinkInfoOpenBSD();
    void AddImplicitLinkInfo();
    void AddImplicitLinkInfo(std::string const& lang);
-   std::set<std::string> ImplicitLinkDirs;
+   void AddRuntimeLinkLibrary(std::string const& lang);
diff --git a/devel/cmake/patches/patch-Source_cmGeneratorTarget_cxx 
b/devel/cmake/patches/patch-Source_cmGeneratorTarget_cxx
index 943780be290..942261362ab 100644
--- a/devel/cmake/patches/patch-Source_cmGeneratorTarget_cxx
+++ b/devel/cmake/patches/patch-Source_cmGeneratorTarget_cxx
@@ -3,7 +3,7 @@ $OpenBSD: patch-Source_cmGeneratorTarget_cxx,v 1.12 2020/01/11 
08:01:09 rsadowsk
 Index: Source/cmGeneratorTarget.cxx
 --- Source/cmGeneratorTarget.cxx.orig
 +++ Source/cmGeneratorTarget.cxx
-@@ -4092,9 +4092,16 @@ cmGeneratorTarget::Names cmGeneratorTarget::GetLibrary
+@@ -4154,9 +4154,16 @@ cmGeneratorTarget::Names cmGeneratorTarget::GetLibrary
    // Check for library version properties.
    const char* version = this->GetProperty("VERSION");
    const char* soversion = this->GetProperty("SOVERSION");
@@ -20,7 +20,7 @@ Index: Source/cmGeneratorTarget.cxx
      // Versioning is supported only for shared libraries and modules,
      // and then only when the platform supports an soname flag.
      version = nullptr;
-@@ -4118,6 +4125,35 @@ cmGeneratorTarget::Names cmGeneratorTarget::GetLibrary
+@@ -4180,6 +4187,35 @@ cmGeneratorTarget::Names cmGeneratorTarget::GetLibrary
  
    // The library name.
    targetNames.Output = prefix + targetNames.Base + suffix;
diff --git a/devel/cmake/patches/patch-Source_cmGlobalGenerator_cxx 
b/devel/cmake/patches/patch-Source_cmGlobalGenerator_cxx
index 4687b72ccc8..cfe9d4f106e 100644
--- a/devel/cmake/patches/patch-Source_cmGlobalGenerator_cxx
+++ b/devel/cmake/patches/patch-Source_cmGlobalGenerator_cxx
@@ -3,13 +3,13 @@ $OpenBSD: patch-Source_cmGlobalGenerator_cxx,v 1.12 
2020/01/11 08:01:09 rsadowsk
 Index: Source/cmGlobalGenerator.cxx
 --- Source/cmGlobalGenerator.cxx.orig
 +++ Source/cmGlobalGenerator.cxx
-@@ -2454,6 +2454,9 @@ void cmGlobalGenerator::AddGlobalTarget_Test(
+@@ -2499,6 +2499,9 @@ void cmGlobalGenerator::AddGlobalTarget_Test(
    cmCustomCommandLine singleLine;
    singleLine.push_back(cmSystemTools::GetCTestCommand());
    singleLine.push_back("--force-new-ctest-process");
 +  // Skip tests requiring internet access
 +  singleLine.push_back("--exclude-regex");
 +  
singleLine.push_back("\"CMake.FileDownload|CTestTestUpload|RunCMake.ctest_submit\"");
-   if (cmakeCfgIntDir && *cmakeCfgIntDir && cmakeCfgIntDir[0] != '.') {
-     singleLine.push_back("-C");
-     singleLine.push_back(cmakeCfgIntDir);
+   if (auto testArgs = mf->GetDefinition("CMAKE_CTEST_ARGUMENTS")) {
+     std::vector<std::string> args;
+     cmExpandList(testArgs, args);
diff --git a/devel/cmake/patches/patch-Source_cmInstallCommand_cxx 
b/devel/cmake/patches/patch-Source_cmInstallCommand_cxx
index 8ee21ab66ea..a36898d55a8 100644
--- a/devel/cmake/patches/patch-Source_cmInstallCommand_cxx
+++ b/devel/cmake/patches/patch-Source_cmInstallCommand_cxx
@@ -2,7 +2,7 @@ $OpenBSD: patch-Source_cmInstallCommand_cxx,v 1.16 2020/01/11 
08:01:09 rsadowski
 Index: Source/cmInstallCommand.cxx
 --- Source/cmInstallCommand.cxx.orig
 +++ Source/cmInstallCommand.cxx
-@@ -379,6 +379,9 @@ bool HandleTargetsMode(std::vector<std::string> const&
+@@ -380,6 +380,9 @@ bool HandleTargetsMode(std::vector<std::string> const&
    }
  
    // Select the mode for installing symlinks to versioned shared libraries.
@@ -12,7 +12,7 @@ Index: Source/cmInstallCommand.cxx
    cmInstallTargetGenerator::NamelinkModeType namelinkMode =
      cmInstallTargetGenerator::NamelinkModeNone;
    if (libraryArgs.GetNamelinkOnly()) {
-@@ -386,6 +389,10 @@ bool HandleTargetsMode(std::vector<std::string> const&
+@@ -387,6 +390,10 @@ bool HandleTargetsMode(std::vector<std::string> const&
    } else if (libraryArgs.GetNamelinkSkip()) {
      namelinkMode = cmInstallTargetGenerator::NamelinkModeSkip;
    }
diff --git a/devel/cmake/patches/patch-Source_cmInstallTargetGenerator_cxx 
b/devel/cmake/patches/patch-Source_cmInstallTargetGenerator_cxx
new file mode 100644
index 00000000000..96d54e09edf
--- /dev/null
+++ b/devel/cmake/patches/patch-Source_cmInstallTargetGenerator_cxx
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+Index: Source/cmInstallTargetGenerator.cxx
+--- Source/cmInstallTargetGenerator.cxx.orig
++++ Source/cmInstallTargetGenerator.cxx
+@@ -793,6 +793,11 @@ void cmInstallTargetGenerator::AddStripRule(std::ostre
+     return;
+   }
+ 
++  // Don't handle OpenBSD debug package builds.
++  if (this->Target->GetPropertyAsBool("OPENBSD_DEBUG_PACKAGES")) {
++    return;
++  }
++
+   // Don't handle OSX Bundles.
+   if (this->Target->Target->GetMakefile()->IsOn("APPLE") &&
+       this->Target->GetPropertyAsBool("MACOSX_BUNDLE")) {
diff --git a/devel/cmake/patches/patch-Source_cmSystemTools_cxx 
b/devel/cmake/patches/patch-Source_cmSystemTools_cxx
index 815fc5679bd..993dc26811f 100644
--- a/devel/cmake/patches/patch-Source_cmSystemTools_cxx
+++ b/devel/cmake/patches/patch-Source_cmSystemTools_cxx
@@ -29,7 +29,7 @@ the invalid use of the interface.
 Index: Source/cmSystemTools.cxx
 --- Source/cmSystemTools.cxx.orig
 +++ Source/cmSystemTools.cxx
-@@ -1505,8 +1505,6 @@ bool extract_tar(const std::string& outFileName,
+@@ -1508,8 +1508,6 @@ bool extract_tar(const std::string& outFileName,
                   const std::vector<std::string>& files, bool verbose,
                   bool extract)
  {
diff --git a/devel/cmake/patches/patch-Source_cmTarget_cxx 
b/devel/cmake/patches/patch-Source_cmTarget_cxx
index d7357e6e997..4fc7d03424f 100644
--- a/devel/cmake/patches/patch-Source_cmTarget_cxx
+++ b/devel/cmake/patches/patch-Source_cmTarget_cxx
@@ -3,7 +3,7 @@ $OpenBSD: patch-Source_cmTarget_cxx,v 1.36 2020/01/11 08:01:09 
rsadowski Exp $
 Index: Source/cmTarget.cxx
 --- Source/cmTarget.cxx.orig
 +++ Source/cmTarget.cxx
-@@ -287,7 +287,7 @@ cmTarget::cmTarget(std::string const& name, cmStateEnu
+@@ -293,7 +293,7 @@ cmTarget::cmTarget(std::string const& name, cmStateEnu
      initProp("INSTALL_NAME_DIR");
      initProp("INSTALL_REMOVE_ENVIRONMENT_RPATH");
      initPropValue("INSTALL_RPATH", "");
diff --git 
a/devel/cmake/patches/patch-Tests_CMakeTests_ModuleNoticesTest_cmake_in 
b/devel/cmake/patches/patch-Tests_CMakeTests_ModuleNoticesTest_cmake_in
deleted file mode 100644
index d16480d4728..00000000000
--- a/devel/cmake/patches/patch-Tests_CMakeTests_ModuleNoticesTest_cmake_in
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-Tests_CMakeTests_ModuleNoticesTest_cmake_in,v 1.8 2016/11/28 
09:15:13 dcoppa Exp $
---- Tests/CMakeTests/ModuleNoticesTest.cmake.in.orig   Fri Nov 11 15:37:14 2016
-+++ Tests/CMakeTests/ModuleNoticesTest.cmake.in        Fri Nov 25 22:31:45 2016
-@@ -9,6 +9,8 @@ string(REPLACE "\r\r" "\r" notice_regex "${notice_rege
- # Modules that do not require our notice.
- set(notice_exceptions
-   FindCUDA.cmake # MIT License, distributed here from upstream project
-+  FindIconv.cmake
-+  FindLCMS.cmake
-   )
- 
- # Load the list of modules to check.
diff --git a/devel/cmake/pkg/PLIST b/devel/cmake/pkg/PLIST
index 048c510a8c9..4543d5d3754 100644
--- a/devel/cmake/pkg/PLIST
+++ b/devel/cmake/pkg/PLIST
@@ -25,6 +25,7 @@
 @man man/man7/cmake-toolchains.7
 @man man/man7/cmake-variables.7
 @man man/man7/cpack-generators.7
+share/aclocal/
 share/aclocal/cmake.m4
 share/cmake/
 share/cmake/Help/
@@ -179,10 +180,12 @@ share/cmake/Help/envvar/CC.rst
 share/cmake/Help/envvar/CFLAGS.rst
 share/cmake/Help/envvar/CMAKE_BUILD_PARALLEL_LEVEL.rst
 share/cmake/Help/envvar/CMAKE_CONFIG_TYPE.rst
+share/cmake/Help/envvar/CMAKE_EXPORT_COMPILE_COMMANDS.rst
 share/cmake/Help/envvar/CMAKE_GENERATOR.rst
 share/cmake/Help/envvar/CMAKE_GENERATOR_INSTANCE.rst
 share/cmake/Help/envvar/CMAKE_GENERATOR_PLATFORM.rst
 share/cmake/Help/envvar/CMAKE_GENERATOR_TOOLSET.rst
+share/cmake/Help/envvar/CMAKE_LANG_COMPILER_LAUNCHER.rst
 share/cmake/Help/envvar/CMAKE_MSVCIDE_RUN_PATH.rst
 share/cmake/Help/envvar/CMAKE_NO_VERBOSE.rst
 share/cmake/Help/envvar/CMAKE_OSX_ARCHITECTURES.rst
@@ -220,6 +223,7 @@ share/cmake/Help/generator/MSYS Makefiles.rst
 share/cmake/Help/generator/MinGW Makefiles.rst
 share/cmake/Help/generator/NMake Makefiles JOM.rst
 share/cmake/Help/generator/NMake Makefiles.rst
+share/cmake/Help/generator/Ninja Multi-Config.rst
 share/cmake/Help/generator/Ninja.rst
 share/cmake/Help/generator/Sublime Text 2.rst
 share/cmake/Help/generator/Unix Makefiles.rst
@@ -243,9 +247,11 @@ 
share/cmake/Help/include/INTERFACE_INCLUDE_DIRECTORIES_WARNING.txt
 share/cmake/Help/include/INTERFACE_LINK_LIBRARIES_WARNING.txt
 share/cmake/Help/index.rst
 share/cmake/Help/manual/
+share/cmake/Help/manual/ID_RESERVE.txt
 share/cmake/Help/manual/LINKS.txt
 share/cmake/Help/manual/OPTIONS_BUILD.txt
 share/cmake/Help/manual/OPTIONS_HELP.txt
+share/cmake/Help/manual/VS-Choose-Arch.png
 share/cmake/Help/manual/ccmake.1.rst
 share/cmake/Help/manual/cmake-buildsystem.7.rst
 share/cmake/Help/manual/cmake-commands.7.rst
@@ -359,6 +365,7 @@ share/cmake/Help/module/FindBoost.rst
 share/cmake/Help/module/FindBullet.rst
 share/cmake/Help/module/FindCABLE.rst
 share/cmake/Help/module/FindCUDA.rst
+share/cmake/Help/module/FindCUDAToolkit.rst
 share/cmake/Help/module/FindCURL.rst
 share/cmake/Help/module/FindCVS.rst
 share/cmake/Help/module/FindCoin3D.rst
@@ -631,6 +638,11 @@ share/cmake/Help/policy/CMP0094.rst
 share/cmake/Help/policy/CMP0095.rst
 share/cmake/Help/policy/CMP0096.rst
 share/cmake/Help/policy/CMP0097.rst
+share/cmake/Help/policy/CMP0098.rst
+share/cmake/Help/policy/CMP0099.rst
+share/cmake/Help/policy/CMP0100.rst
+share/cmake/Help/policy/CMP0101.rst
+share/cmake/Help/policy/CMP0102.rst
 share/cmake/Help/policy/DEPRECATED.txt
 share/cmake/Help/policy/DISALLOWED_COMMAND.txt
 share/cmake/Help/prop_cache/
@@ -683,6 +695,7 @@ share/cmake/Help/prop_gbl/AUTOGEN_TARGETS_FOLDER.rst
 share/cmake/Help/prop_gbl/AUTOMOC_SOURCE_GROUP.rst
 share/cmake/Help/prop_gbl/AUTOMOC_TARGETS_FOLDER.rst
 share/cmake/Help/prop_gbl/AUTORCC_SOURCE_GROUP.rst
+share/cmake/Help/prop_gbl/CMAKE_CUDA_KNOWN_FEATURES.rst
 share/cmake/Help/prop_gbl/CMAKE_CXX_KNOWN_FEATURES.rst
 share/cmake/Help/prop_gbl/CMAKE_C_KNOWN_FEATURES.rst
 share/cmake/Help/prop_gbl/CMAKE_ROLE.rst
@@ -799,6 +812,7 @@ share/cmake/Help/prop_test/WILL_FAIL.rst
 share/cmake/Help/prop_test/WORKING_DIRECTORY.rst
 share/cmake/Help/prop_tgt/
 share/cmake/Help/prop_tgt/ADDITIONAL_CLEAN_FILES.rst
+share/cmake/Help/prop_tgt/AIX_EXPORT_ALL_SYMBOLS.rst
 share/cmake/Help/prop_tgt/ALIASED_TARGET.rst
 share/cmake/Help/prop_tgt/ANDROID_ANT_ADDITIONAL_OPTIONS.rst
 share/cmake/Help/prop_tgt/ANDROID_API.rst
@@ -867,6 +881,8 @@ share/cmake/Help/prop_tgt/CROSSCOMPILING_EMULATOR.rst
 share/cmake/Help/prop_tgt/CUDA_EXTENSIONS.rst
 share/cmake/Help/prop_tgt/CUDA_PTX_COMPILATION.rst
 share/cmake/Help/prop_tgt/CUDA_RESOLVE_DEVICE_SYMBOLS.rst
+share/cmake/Help/prop_tgt/CUDA_RUNTIME_LIBRARY-VALUES.txt
+share/cmake/Help/prop_tgt/CUDA_RUNTIME_LIBRARY.rst
 share/cmake/Help/prop_tgt/CUDA_SEPARABLE_COMPILATION.rst
 share/cmake/Help/prop_tgt/CUDA_STANDARD.rst
 share/cmake/Help/prop_tgt/CUDA_STANDARD_REQUIRED.rst
@@ -880,7 +896,9 @@ share/cmake/Help/prop_tgt/DEBUG_POSTFIX.rst
 share/cmake/Help/prop_tgt/DEFINE_SYMBOL.rst
 share/cmake/Help/prop_tgt/DEPLOYMENT_ADDITIONAL_FILES.rst
 share/cmake/Help/prop_tgt/DEPLOYMENT_REMOTE_DIRECTORY.rst
+share/cmake/Help/prop_tgt/DEPRECATION.rst
 share/cmake/Help/prop_tgt/DISABLE_PRECOMPILE_HEADERS.rst
+share/cmake/Help/prop_tgt/DOTNET_TARGET_FRAMEWORK.rst
 share/cmake/Help/prop_tgt/DOTNET_TARGET_FRAMEWORK_VERSION.rst
 share/cmake/Help/prop_tgt/ENABLE_EXPORTS.rst
 share/cmake/Help/prop_tgt/EXCLUDE_FROM_ALL.rst
@@ -950,6 +968,7 @@ 
share/cmake/Help/prop_tgt/INTERPROCEDURAL_OPTIMIZATION_CONFIG.rst
 share/cmake/Help/prop_tgt/IOS_INSTALL_COMBINED.rst
 share/cmake/Help/prop_tgt/JOB_POOL_COMPILE.rst
 share/cmake/Help/prop_tgt/JOB_POOL_LINK.rst
+share/cmake/Help/prop_tgt/JOB_POOL_PRECOMPILE_HEADER.rst
 share/cmake/Help/prop_tgt/LABELS.rst
 share/cmake/Help/prop_tgt/LANG_CLANG_TIDY.rst
 share/cmake/Help/prop_tgt/LANG_COMPILER_LAUNCHER.rst
@@ -979,6 +998,8 @@ share/cmake/Help/prop_tgt/LINK_SEARCH_START_STATIC.rst
 share/cmake/Help/prop_tgt/LINK_WHAT_YOU_USE.rst
 share/cmake/Help/prop_tgt/LOCATION.rst
 share/cmake/Help/prop_tgt/LOCATION_CONFIG.rst
+share/cmake/Help/prop_tgt/MACHO_COMPATIBILITY_VERSION.rst
+share/cmake/Help/prop_tgt/MACHO_CURRENT_VERSION.rst
 share/cmake/Help/prop_tgt/MACOSX_BUNDLE.rst
 share/cmake/Help/prop_tgt/MACOSX_BUNDLE_INFO_PLIST.rst
 share/cmake/Help/prop_tgt/MACOSX_FRAMEWORK_INFO_PLIST.rst
@@ -1047,6 +1068,7 @@ 
share/cmake/Help/prop_tgt/VS_DEBUGGER_COMMAND_ARGUMENTS.rst
 share/cmake/Help/prop_tgt/VS_DEBUGGER_ENVIRONMENT.rst
 share/cmake/Help/prop_tgt/VS_DEBUGGER_WORKING_DIRECTORY.rst
 share/cmake/Help/prop_tgt/VS_DESKTOP_EXTENSIONS_VERSION.rst
+share/cmake/Help/prop_tgt/VS_DOTNET_DOCUMENTATION_FILE.rst
 share/cmake/Help/prop_tgt/VS_DOTNET_REFERENCEPROP_refname_TAG_tagname.rst
 share/cmake/Help/prop_tgt/VS_DOTNET_REFERENCES.rst
 share/cmake/Help/prop_tgt/VS_DOTNET_REFERENCES_COPY_LOCAL.rst
@@ -1100,6 +1122,7 @@ 
share/cmake/Help/prop_tgt/XCODE_SCHEME_THREAD_SANITIZER.rst
 share/cmake/Help/prop_tgt/XCODE_SCHEME_THREAD_SANITIZER_STOP.rst
 share/cmake/Help/prop_tgt/XCODE_SCHEME_UNDEFINED_BEHAVIOUR_SANITIZER.rst
 share/cmake/Help/prop_tgt/XCODE_SCHEME_UNDEFINED_BEHAVIOUR_SANITIZER_STOP.rst
+share/cmake/Help/prop_tgt/XCODE_SCHEME_WORKING_DIRECTORY.rst
 share/cmake/Help/prop_tgt/XCODE_SCHEME_ZOMBIE_OBJECTS.rst
 share/cmake/Help/prop_tgt/XCTEST.rst
 share/cmake/Help/prop_tgt/XXX_OUTPUT_DIRECTORY.txt
@@ -1114,6 +1137,7 @@ share/cmake/Help/release/3.13.rst
 share/cmake/Help/release/3.14.rst
 share/cmake/Help/release/3.15.rst
 share/cmake/Help/release/3.16.rst
+share/cmake/Help/release/3.17.rst
 share/cmake/Help/release/3.2.rst
 share/cmake/Help/release/3.3.rst
 share/cmake/Help/release/3.4.rst
@@ -1131,6 +1155,7 @@ share/cmake/Help/variable/BORLAND.rst
 share/cmake/Help/variable/BUILD_SHARED_LIBS.rst
 share/cmake/Help/variable/CACHE.rst
 share/cmake/Help/variable/CMAKE_ABSOLUTE_DESTINATION_FILES.rst
+share/cmake/Help/variable/CMAKE_AIX_EXPORT_ALL_SYMBOLS.rst
 share/cmake/Help/variable/CMAKE_ANDROID_ANT_ADDITIONAL_OPTIONS.rst
 share/cmake/Help/variable/CMAKE_ANDROID_API.rst
 share/cmake/Help/variable/CMAKE_ANDROID_API_MIN.rst
@@ -1207,15 +1232,23 @@ share/cmake/Help/variable/CMAKE_CONFIG_POSTFIX.rst
 share/cmake/Help/variable/CMAKE_CPACK_COMMAND.rst
 share/cmake/Help/variable/CMAKE_CROSSCOMPILING.rst
 share/cmake/Help/variable/CMAKE_CROSSCOMPILING_EMULATOR.rst
+share/cmake/Help/variable/CMAKE_CROSS_CONFIGS.rst
+share/cmake/Help/variable/CMAKE_CTEST_ARGUMENTS.rst
 share/cmake/Help/variable/CMAKE_CTEST_COMMAND.rst
+share/cmake/Help/variable/CMAKE_CUDA_COMPILE_FEATURES.rst
 share/cmake/Help/variable/CMAKE_CUDA_EXTENSIONS.rst
 share/cmake/Help/variable/CMAKE_CUDA_HOST_COMPILER.rst
 share/cmake/Help/variable/CMAKE_CUDA_RESOLVE_DEVICE_SYMBOLS.rst
+share/cmake/Help/variable/CMAKE_CUDA_RUNTIME_LIBRARY.rst
 share/cmake/Help/variable/CMAKE_CUDA_SEPARABLE_COMPILATION.rst
 share/cmake/Help/variable/CMAKE_CUDA_STANDARD.rst
 share/cmake/Help/variable/CMAKE_CUDA_STANDARD_REQUIRED.rst
 share/cmake/Help/variable/CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES.rst
 share/cmake/Help/variable/CMAKE_CURRENT_BINARY_DIR.rst
+share/cmake/Help/variable/CMAKE_CURRENT_FUNCTION.rst
+share/cmake/Help/variable/CMAKE_CURRENT_FUNCTION_LIST_DIR.rst
+share/cmake/Help/variable/CMAKE_CURRENT_FUNCTION_LIST_FILE.rst
+share/cmake/Help/variable/CMAKE_CURRENT_FUNCTION_LIST_LINE.rst
 share/cmake/Help/variable/CMAKE_CURRENT_LIST_DIR.rst
 share/cmake/Help/variable/CMAKE_CURRENT_LIST_FILE.rst
 share/cmake/Help/variable/CMAKE_CURRENT_LIST_LINE.rst
@@ -1230,11 +1263,14 @@ share/cmake/Help/variable/CMAKE_C_STANDARD.rst
 share/cmake/Help/variable/CMAKE_C_STANDARD_REQUIRED.rst
 share/cmake/Help/variable/CMAKE_DEBUG_POSTFIX.rst
 share/cmake/Help/variable/CMAKE_DEBUG_TARGET_PROPERTIES.rst
+share/cmake/Help/variable/CMAKE_DEFAULT_BUILD_TYPE.rst
+share/cmake/Help/variable/CMAKE_DEFAULT_CONFIGS.rst
 share/cmake/Help/variable/CMAKE_DEPENDS_IN_PROJECT_ONLY.rst
 share/cmake/Help/variable/CMAKE_DIRECTORY_LABELS.rst
 share/cmake/Help/variable/CMAKE_DISABLE_FIND_PACKAGE_PackageName.rst
 share/cmake/Help/variable/CMAKE_DISABLE_PRECOMPILE_HEADERS.rst
 share/cmake/Help/variable/CMAKE_DL_LIBS.rst
+share/cmake/Help/variable/CMAKE_DOTNET_TARGET_FRAMEWORK.rst
 share/cmake/Help/variable/CMAKE_DOTNET_TARGET_FRAMEWORK_VERSION.rst
 share/cmake/Help/variable/CMAKE_ECLIPSE_GENERATE_LINKED_RESOURCES.rst
 share/cmake/Help/variable/CMAKE_ECLIPSE_GENERATE_SOURCE_PROJECT.rst
@@ -1257,6 +1293,7 @@ 
share/cmake/Help/variable/CMAKE_EXPORT_PACKAGE_REGISTRY.rst
 share/cmake/Help/variable/CMAKE_EXTRA_GENERATOR.rst
 share/cmake/Help/variable/CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES.rst
 share/cmake/Help/variable/CMAKE_FIND_APPBUNDLE.rst
+share/cmake/Help/variable/CMAKE_FIND_DEBUG_MODE.rst
 share/cmake/Help/variable/CMAKE_FIND_FRAMEWORK.rst
 share/cmake/Help/variable/CMAKE_FIND_LIBRARY_CUSTOM_LIB_SUFFIX.rst
 share/cmake/Help/variable/CMAKE_FIND_LIBRARY_PREFIXES.rst
@@ -1334,6 +1371,7 @@ share/cmake/Help/variable/CMAKE_IOS_INSTALL_COMBINED.rst
 share/cmake/Help/variable/CMAKE_JOB_POOLS.rst
 share/cmake/Help/variable/CMAKE_JOB_POOL_COMPILE.rst
 share/cmake/Help/variable/CMAKE_JOB_POOL_LINK.rst
+share/cmake/Help/variable/CMAKE_JOB_POOL_PRECOMPILE_HEADER.rst
 share/cmake/Help/variable/CMAKE_LANG_ANDROID_TOOLCHAIN_MACHINE.rst
 share/cmake/Help/variable/CMAKE_LANG_ANDROID_TOOLCHAIN_PREFIX.rst
 share/cmake/Help/variable/CMAKE_LANG_ANDROID_TOOLCHAIN_SUFFIX.rst
@@ -1420,7 +1458,10 @@ 
share/cmake/Help/variable/CMAKE_MAP_IMPORTED_CONFIG_CONFIG.rst
 share/cmake/Help/variable/CMAKE_MATCH_COUNT.rst
 share/cmake/Help/variable/CMAKE_MATCH_n.rst
 share/cmake/Help/variable/CMAKE_MAXIMUM_RECURSION_DEPTH.rst
+share/cmake/Help/variable/CMAKE_MESSAGE_CONTEXT.rst
+share/cmake/Help/variable/CMAKE_MESSAGE_CONTEXT_SHOW.rst
 share/cmake/Help/variable/CMAKE_MESSAGE_INDENT.rst
+share/cmake/Help/variable/CMAKE_MESSAGE_LOG_LEVEL.rst
 share/cmake/Help/variable/CMAKE_MFC_FLAG.rst
 share/cmake/Help/variable/CMAKE_MINIMUM_REQUIRED_VERSION.rst
 share/cmake/Help/variable/CMAKE_MINOR_VERSION.rst
@@ -1463,6 +1504,7 @@ share/cmake/Help/variable/CMAKE_PROJECT_INCLUDE.rst
 share/cmake/Help/variable/CMAKE_PROJECT_INCLUDE_BEFORE.rst
 share/cmake/Help/variable/CMAKE_PROJECT_NAME.rst
 share/cmake/Help/variable/CMAKE_PROJECT_PROJECT-NAME_INCLUDE.rst
+share/cmake/Help/variable/CMAKE_PROJECT_PROJECT-NAME_INCLUDE_BEFORE.rst
 share/cmake/Help/variable/CMAKE_PROJECT_VERSION.rst
 share/cmake/Help/variable/CMAKE_PROJECT_VERSION_MAJOR.rst
 share/cmake/Help/variable/CMAKE_PROJECT_VERSION_MINOR.rst
@@ -1567,6 +1609,7 @@ 
share/cmake/Help/variable/CMAKE_XCODE_SCHEME_DEBUG_DOCUMENT_VERSIONING.rst
 share/cmake/Help/variable/CMAKE_XCODE_SCHEME_DISABLE_MAIN_THREAD_CHECKER.rst
 share/cmake/Help/variable/CMAKE_XCODE_SCHEME_DYNAMIC_LIBRARY_LOADS.rst
 share/cmake/Help/variable/CMAKE_XCODE_SCHEME_DYNAMIC_LINKER_API_USAGE.rst
+share/cmake/Help/variable/CMAKE_XCODE_SCHEME_ENVIRONMENT.rst
 share/cmake/Help/variable/CMAKE_XCODE_SCHEME_GUARD_MALLOC.rst
 share/cmake/Help/variable/CMAKE_XCODE_SCHEME_MAIN_THREAD_CHECKER_STOP.rst
 share/cmake/Help/variable/CMAKE_XCODE_SCHEME_MALLOC_GUARD_EDGES.rst
@@ -1576,6 +1619,7 @@ 
share/cmake/Help/variable/CMAKE_XCODE_SCHEME_THREAD_SANITIZER.rst
 share/cmake/Help/variable/CMAKE_XCODE_SCHEME_THREAD_SANITIZER_STOP.rst
 share/cmake/Help/variable/CMAKE_XCODE_SCHEME_UNDEFINED_BEHAVIOUR_SANITIZER.rst
 
share/cmake/Help/variable/CMAKE_XCODE_SCHEME_UNDEFINED_BEHAVIOUR_SANITIZER_STOP.rst
+share/cmake/Help/variable/CMAKE_XCODE_SCHEME_WORKING_DIRECTORY.rst
 share/cmake/Help/variable/CMAKE_XCODE_SCHEME_ZOMBIE_OBJECTS.rst
 share/cmake/Help/variable/CPACK_ABSOLUTE_DESTINATION_FILES.rst
 share/cmake/Help/variable/CPACK_COMPONENT_INCLUDE_TOPLEVEL_DIRECTORY.rst
@@ -2057,7 +2101,9 @@ share/cmake/Modules/Compiler/XL-C-DetermineCompiler.cmake
 share/cmake/Modules/Compiler/XL-C.cmake
 share/cmake/Modules/Compiler/XL-CXX-DetermineCompiler.cmake
 share/cmake/Modules/Compiler/XL-CXX.cmake
+share/cmake/Modules/Compiler/XL-Fortran/
 share/cmake/Modules/Compiler/XL-Fortran.cmake
+share/cmake/Modules/Compiler/XL-Fortran/cpp
 share/cmake/Modules/Compiler/XL.cmake
 share/cmake/Modules/Compiler/XLClang-C-DetermineCompiler.cmake
 share/cmake/Modules/Compiler/XLClang-C.cmake
@@ -2108,6 +2154,7 @@ share/cmake/Modules/FindCUDA/make2cmake.cmake
 share/cmake/Modules/FindCUDA/parse_cubin.cmake
 share/cmake/Modules/FindCUDA/run_nvcc.cmake
 share/cmake/Modules/FindCUDA/select_compute_arch.cmake
+share/cmake/Modules/FindCUDAToolkit.cmake
 share/cmake/Modules/FindCURL.cmake
 share/cmake/Modules/FindCVS.cmake
 share/cmake/Modules/FindCoin3D.cmake
@@ -2158,7 +2205,6 @@ share/cmake/Modules/FindKDE3.cmake
 share/cmake/Modules/FindKDE4.cmake
 share/cmake/Modules/FindLAPACK.cmake
 share/cmake/Modules/FindLATEX.cmake
-share/cmake/Modules/FindLCMS.cmake
 share/cmake/Modules/FindLTTngUST.cmake
 share/cmake/Modules/FindLibArchive.cmake
 share/cmake/Modules/FindLibLZMA.cmake
@@ -2572,8 +2618,10 @@ share/cmake/Modules/Platform/ULTRIX.cmake
 share/cmake/Modules/Platform/UNIX_SV.cmake
 share/cmake/Modules/Platform/UnixPaths.cmake
 share/cmake/Modules/Platform/UnixWare.cmake
+share/cmake/Modules/Platform/Windows-Apple-Swift.cmake
 share/cmake/Modules/Platform/Windows-Borland-C.cmake
 share/cmake/Modules/Platform/Windows-Borland-CXX.cmake
+share/cmake/Modules/Platform/Windows-Clang-ASM.cmake
 share/cmake/Modules/Platform/Windows-Clang-C.cmake
 share/cmake/Modules/Platform/Windows-Clang-CXX.cmake
 share/cmake/Modules/Platform/Windows-Clang.cmake
@@ -2583,6 +2631,7 @@ share/cmake/Modules/Platform/Windows-Embarcadero-CXX.cmake
 share/cmake/Modules/Platform/Windows-Embarcadero.cmake
 share/cmake/Modules/Platform/Windows-Flang-Fortran.cmake
 share/cmake/Modules/Platform/Windows-G95-Fortran.cmake
+share/cmake/Modules/Platform/Windows-GNU-ASM.cmake
 share/cmake/Modules/Platform/Windows-GNU-C-ABI.cmake
 share/cmake/Modules/Platform/Windows-GNU-C.cmake
 share/cmake/Modules/Platform/Windows-GNU-CXX-ABI.cmake
@@ -2614,15 +2663,19 @@ share/cmake/Modules/Platform/WindowsCE-MSVC-C.cmake
 share/cmake/Modules/Platform/WindowsCE-MSVC-CXX.cmake
 share/cmake/Modules/Platform/WindowsCE.cmake
 share/cmake/Modules/Platform/WindowsPaths.cmake
+share/cmake/Modules/Platform/WindowsPhone-Clang-ASM.cmake
 share/cmake/Modules/Platform/WindowsPhone-Clang-C.cmake
 share/cmake/Modules/Platform/WindowsPhone-Clang-CXX.cmake
+share/cmake/Modules/Platform/WindowsPhone-GNU-ASM.cmake
 share/cmake/Modules/Platform/WindowsPhone-GNU-C.cmake
 share/cmake/Modules/Platform/WindowsPhone-GNU-CXX.cmake
 share/cmake/Modules/Platform/WindowsPhone-MSVC-C.cmake
 share/cmake/Modules/Platform/WindowsPhone-MSVC-CXX.cmake
 share/cmake/Modules/Platform/WindowsPhone.cmake
+share/cmake/Modules/Platform/WindowsStore-Clang-ASM.cmake
 share/cmake/Modules/Platform/WindowsStore-Clang-C.cmake
 share/cmake/Modules/Platform/WindowsStore-Clang-CXX.cmake
+share/cmake/Modules/Platform/WindowsStore-GNU-ASM.cmake
 share/cmake/Modules/Platform/WindowsStore-GNU-C.cmake
 share/cmake/Modules/Platform/WindowsStore-GNU-CXX.cmake
 share/cmake/Modules/Platform/WindowsStore-MSVC-C.cmake
@@ -2760,6 +2813,12 @@ share/doc/cmake/Copyright.txt
 share/doc/cmake/cmsys/
 share/doc/cmake/cmsys/Copyright.txt
 share/doc/cmake/html/
+share/doc/cmake/html/_images/
+share/doc/cmake/html/_images/GUI-Add-Entry.png
+share/doc/cmake/html/_images/GUI-Choose-Generator.png
+share/doc/cmake/html/_images/GUI-Configure-Dialog.png
+share/doc/cmake/html/_images/GUI-Source-Binary.png
+share/doc/cmake/html/_images/VS-Choose-Arch.png
 share/doc/cmake/html/_sources/
 share/doc/cmake/html/_sources/command/
 share/doc/cmake/html/_sources/command/add_compile_definitions.txt
@@ -2907,10 +2966,12 @@ share/doc/cmake/html/_sources/envvar/CC.txt
 share/doc/cmake/html/_sources/envvar/CFLAGS.txt
 share/doc/cmake/html/_sources/envvar/CMAKE_BUILD_PARALLEL_LEVEL.txt
 share/doc/cmake/html/_sources/envvar/CMAKE_CONFIG_TYPE.txt
+share/doc/cmake/html/_sources/envvar/CMAKE_EXPORT_COMPILE_COMMANDS.txt
 share/doc/cmake/html/_sources/envvar/CMAKE_GENERATOR.txt
 share/doc/cmake/html/_sources/envvar/CMAKE_GENERATOR_INSTANCE.txt
 share/doc/cmake/html/_sources/envvar/CMAKE_GENERATOR_PLATFORM.txt
 share/doc/cmake/html/_sources/envvar/CMAKE_GENERATOR_TOOLSET.txt
+share/doc/cmake/html/_sources/envvar/CMAKE_LANG_COMPILER_LAUNCHER.txt
 share/doc/cmake/html/_sources/envvar/CMAKE_MSVCIDE_RUN_PATH.txt
 share/doc/cmake/html/_sources/envvar/CMAKE_NO_VERBOSE.txt
 share/doc/cmake/html/_sources/envvar/CMAKE_OSX_ARCHITECTURES.txt
@@ -2947,6 +3008,7 @@ share/doc/cmake/html/_sources/generator/MSYS Makefiles.txt
 share/doc/cmake/html/_sources/generator/MinGW Makefiles.txt
 share/doc/cmake/html/_sources/generator/NMake Makefiles JOM.txt
 share/doc/cmake/html/_sources/generator/NMake Makefiles.txt
+share/doc/cmake/html/_sources/generator/Ninja Multi-Config.txt
 share/doc/cmake/html/_sources/generator/Ninja.txt
 share/doc/cmake/html/_sources/generator/Sublime Text 2.txt
 share/doc/cmake/html/_sources/generator/Unix Makefiles.txt
@@ -2966,6 +3028,10 @@ share/doc/cmake/html/_sources/generator/Xcode.txt
 share/doc/cmake/html/_sources/guide/
 share/doc/cmake/html/_sources/guide/tutorial/
 share/doc/cmake/html/_sources/guide/tutorial/index.txt
+share/doc/cmake/html/_sources/guide/user-interaction/
+share/doc/cmake/html/_sources/guide/user-interaction/index.txt
+share/doc/cmake/html/_sources/guide/using-dependencies/
+share/doc/cmake/html/_sources/guide/using-dependencies/index.txt
 share/doc/cmake/html/_sources/index.txt
 share/doc/cmake/html/_sources/manual/
 share/doc/cmake/html/_sources/manual/ccmake.1.txt
@@ -3081,6 +3147,7 @@ share/doc/cmake/html/_sources/module/FindBoost.txt
 share/doc/cmake/html/_sources/module/FindBullet.txt
 share/doc/cmake/html/_sources/module/FindCABLE.txt
 share/doc/cmake/html/_sources/module/FindCUDA.txt
+share/doc/cmake/html/_sources/module/FindCUDAToolkit.txt
 share/doc/cmake/html/_sources/module/FindCURL.txt
 share/doc/cmake/html/_sources/module/FindCVS.txt
 share/doc/cmake/html/_sources/module/FindCoin3D.txt
@@ -3353,6 +3420,11 @@ share/doc/cmake/html/_sources/policy/CMP0094.txt
 share/doc/cmake/html/_sources/policy/CMP0095.txt
 share/doc/cmake/html/_sources/policy/CMP0096.txt
 share/doc/cmake/html/_sources/policy/CMP0097.txt
+share/doc/cmake/html/_sources/policy/CMP0098.txt
+share/doc/cmake/html/_sources/policy/CMP0099.txt
+share/doc/cmake/html/_sources/policy/CMP0100.txt
+share/doc/cmake/html/_sources/policy/CMP0101.txt
+share/doc/cmake/html/_sources/policy/CMP0102.txt
 share/doc/cmake/html/_sources/prop_cache/
 share/doc/cmake/html/_sources/prop_cache/ADVANCED.txt
 share/doc/cmake/html/_sources/prop_cache/HELPSTRING.txt
@@ -3403,6 +3475,7 @@ 
share/doc/cmake/html/_sources/prop_gbl/AUTOGEN_TARGETS_FOLDER.txt
 share/doc/cmake/html/_sources/prop_gbl/AUTOMOC_SOURCE_GROUP.txt
 share/doc/cmake/html/_sources/prop_gbl/AUTOMOC_TARGETS_FOLDER.txt
 share/doc/cmake/html/_sources/prop_gbl/AUTORCC_SOURCE_GROUP.txt
+share/doc/cmake/html/_sources/prop_gbl/CMAKE_CUDA_KNOWN_FEATURES.txt
 share/doc/cmake/html/_sources/prop_gbl/CMAKE_CXX_KNOWN_FEATURES.txt
 share/doc/cmake/html/_sources/prop_gbl/CMAKE_C_KNOWN_FEATURES.txt
 share/doc/cmake/html/_sources/prop_gbl/CMAKE_ROLE.txt
@@ -3519,6 +3592,7 @@ share/doc/cmake/html/_sources/prop_test/WILL_FAIL.txt
 share/doc/cmake/html/_sources/prop_test/WORKING_DIRECTORY.txt
 share/doc/cmake/html/_sources/prop_tgt/
 share/doc/cmake/html/_sources/prop_tgt/ADDITIONAL_CLEAN_FILES.txt
+share/doc/cmake/html/_sources/prop_tgt/AIX_EXPORT_ALL_SYMBOLS.txt
 share/doc/cmake/html/_sources/prop_tgt/ALIASED_TARGET.txt
 share/doc/cmake/html/_sources/prop_tgt/ANDROID_ANT_ADDITIONAL_OPTIONS.txt
 share/doc/cmake/html/_sources/prop_tgt/ANDROID_API.txt
@@ -3586,6 +3660,7 @@ 
share/doc/cmake/html/_sources/prop_tgt/CROSSCOMPILING_EMULATOR.txt
 share/doc/cmake/html/_sources/prop_tgt/CUDA_EXTENSIONS.txt
 share/doc/cmake/html/_sources/prop_tgt/CUDA_PTX_COMPILATION.txt
 share/doc/cmake/html/_sources/prop_tgt/CUDA_RESOLVE_DEVICE_SYMBOLS.txt
+share/doc/cmake/html/_sources/prop_tgt/CUDA_RUNTIME_LIBRARY.txt
 share/doc/cmake/html/_sources/prop_tgt/CUDA_SEPARABLE_COMPILATION.txt
 share/doc/cmake/html/_sources/prop_tgt/CUDA_STANDARD.txt
 share/doc/cmake/html/_sources/prop_tgt/CUDA_STANDARD_REQUIRED.txt
@@ -3599,7 +3674,9 @@ share/doc/cmake/html/_sources/prop_tgt/DEBUG_POSTFIX.txt
 share/doc/cmake/html/_sources/prop_tgt/DEFINE_SYMBOL.txt
 share/doc/cmake/html/_sources/prop_tgt/DEPLOYMENT_ADDITIONAL_FILES.txt
 share/doc/cmake/html/_sources/prop_tgt/DEPLOYMENT_REMOTE_DIRECTORY.txt
+share/doc/cmake/html/_sources/prop_tgt/DEPRECATION.txt
 share/doc/cmake/html/_sources/prop_tgt/DISABLE_PRECOMPILE_HEADERS.txt
+share/doc/cmake/html/_sources/prop_tgt/DOTNET_TARGET_FRAMEWORK.txt
 share/doc/cmake/html/_sources/prop_tgt/DOTNET_TARGET_FRAMEWORK_VERSION.txt
 share/doc/cmake/html/_sources/prop_tgt/ENABLE_EXPORTS.txt
 share/doc/cmake/html/_sources/prop_tgt/EXCLUDE_FROM_ALL.txt
@@ -3668,6 +3745,7 @@ 
share/doc/cmake/html/_sources/prop_tgt/INTERPROCEDURAL_OPTIMIZATION_CONFIG.txt
 share/doc/cmake/html/_sources/prop_tgt/IOS_INSTALL_COMBINED.txt
 share/doc/cmake/html/_sources/prop_tgt/JOB_POOL_COMPILE.txt
 share/doc/cmake/html/_sources/prop_tgt/JOB_POOL_LINK.txt
+share/doc/cmake/html/_sources/prop_tgt/JOB_POOL_PRECOMPILE_HEADER.txt
 share/doc/cmake/html/_sources/prop_tgt/LABELS.txt
 share/doc/cmake/html/_sources/prop_tgt/LANG_CLANG_TIDY.txt
 share/doc/cmake/html/_sources/prop_tgt/LANG_COMPILER_LAUNCHER.txt
@@ -3696,6 +3774,8 @@ 
share/doc/cmake/html/_sources/prop_tgt/LINK_SEARCH_START_STATIC.txt
 share/doc/cmake/html/_sources/prop_tgt/LINK_WHAT_YOU_USE.txt
 share/doc/cmake/html/_sources/prop_tgt/LOCATION.txt
 share/doc/cmake/html/_sources/prop_tgt/LOCATION_CONFIG.txt
+share/doc/cmake/html/_sources/prop_tgt/MACHO_COMPATIBILITY_VERSION.txt
+share/doc/cmake/html/_sources/prop_tgt/MACHO_CURRENT_VERSION.txt
 share/doc/cmake/html/_sources/prop_tgt/MACOSX_BUNDLE.txt
 share/doc/cmake/html/_sources/prop_tgt/MACOSX_BUNDLE_INFO_PLIST.txt
 share/doc/cmake/html/_sources/prop_tgt/MACOSX_FRAMEWORK_INFO_PLIST.txt
@@ -3762,6 +3842,7 @@ 
share/doc/cmake/html/_sources/prop_tgt/VS_DEBUGGER_COMMAND_ARGUMENTS.txt
 share/doc/cmake/html/_sources/prop_tgt/VS_DEBUGGER_ENVIRONMENT.txt
 share/doc/cmake/html/_sources/prop_tgt/VS_DEBUGGER_WORKING_DIRECTORY.txt
 share/doc/cmake/html/_sources/prop_tgt/VS_DESKTOP_EXTENSIONS_VERSION.txt
+share/doc/cmake/html/_sources/prop_tgt/VS_DOTNET_DOCUMENTATION_FILE.txt
 
share/doc/cmake/html/_sources/prop_tgt/VS_DOTNET_REFERENCEPROP_refname_TAG_tagname.txt
 share/doc/cmake/html/_sources/prop_tgt/VS_DOTNET_REFERENCES.txt
 share/doc/cmake/html/_sources/prop_tgt/VS_DOTNET_REFERENCES_COPY_LOCAL.txt
@@ -3815,6 +3896,7 @@ 
share/doc/cmake/html/_sources/prop_tgt/XCODE_SCHEME_THREAD_SANITIZER.txt
 share/doc/cmake/html/_sources/prop_tgt/XCODE_SCHEME_THREAD_SANITIZER_STOP.txt
 
share/doc/cmake/html/_sources/prop_tgt/XCODE_SCHEME_UNDEFINED_BEHAVIOUR_SANITIZER.txt
 
share/doc/cmake/html/_sources/prop_tgt/XCODE_SCHEME_UNDEFINED_BEHAVIOUR_SANITIZER_STOP.txt
+share/doc/cmake/html/_sources/prop_tgt/XCODE_SCHEME_WORKING_DIRECTORY.txt
 share/doc/cmake/html/_sources/prop_tgt/XCODE_SCHEME_ZOMBIE_OBJECTS.txt
 share/doc/cmake/html/_sources/prop_tgt/XCTEST.txt
 share/doc/cmake/html/_sources/release/
@@ -3827,6 +3909,7 @@ share/doc/cmake/html/_sources/release/3.13.txt
 share/doc/cmake/html/_sources/release/3.14.txt
 share/doc/cmake/html/_sources/release/3.15.txt
 share/doc/cmake/html/_sources/release/3.16.txt
+share/doc/cmake/html/_sources/release/3.17.txt
 share/doc/cmake/html/_sources/release/3.2.txt
 share/doc/cmake/html/_sources/release/3.3.txt
 share/doc/cmake/html/_sources/release/3.4.txt
@@ -3843,6 +3926,7 @@ share/doc/cmake/html/_sources/variable/BORLAND.txt
 share/doc/cmake/html/_sources/variable/BUILD_SHARED_LIBS.txt
 share/doc/cmake/html/_sources/variable/CACHE.txt
 share/doc/cmake/html/_sources/variable/CMAKE_ABSOLUTE_DESTINATION_FILES.txt
+share/doc/cmake/html/_sources/variable/CMAKE_AIX_EXPORT_ALL_SYMBOLS.txt
 share/doc/cmake/html/_sources/variable/CMAKE_ANDROID_ANT_ADDITIONAL_OPTIONS.txt
 share/doc/cmake/html/_sources/variable/CMAKE_ANDROID_API.txt
 share/doc/cmake/html/_sources/variable/CMAKE_ANDROID_API_MIN.txt
@@ -3919,15 +4003,23 @@ 
share/doc/cmake/html/_sources/variable/CMAKE_CONFIG_POSTFIX.txt
 share/doc/cmake/html/_sources/variable/CMAKE_CPACK_COMMAND.txt
 share/doc/cmake/html/_sources/variable/CMAKE_CROSSCOMPILING.txt
 share/doc/cmake/html/_sources/variable/CMAKE_CROSSCOMPILING_EMULATOR.txt
+share/doc/cmake/html/_sources/variable/CMAKE_CROSS_CONFIGS.txt
+share/doc/cmake/html/_sources/variable/CMAKE_CTEST_ARGUMENTS.txt
 share/doc/cmake/html/_sources/variable/CMAKE_CTEST_COMMAND.txt
+share/doc/cmake/html/_sources/variable/CMAKE_CUDA_COMPILE_FEATURES.txt
 share/doc/cmake/html/_sources/variable/CMAKE_CUDA_EXTENSIONS.txt
 share/doc/cmake/html/_sources/variable/CMAKE_CUDA_HOST_COMPILER.txt
 share/doc/cmake/html/_sources/variable/CMAKE_CUDA_RESOLVE_DEVICE_SYMBOLS.txt
+share/doc/cmake/html/_sources/variable/CMAKE_CUDA_RUNTIME_LIBRARY.txt
 share/doc/cmake/html/_sources/variable/CMAKE_CUDA_SEPARABLE_COMPILATION.txt
 share/doc/cmake/html/_sources/variable/CMAKE_CUDA_STANDARD.txt
 share/doc/cmake/html/_sources/variable/CMAKE_CUDA_STANDARD_REQUIRED.txt
 
share/doc/cmake/html/_sources/variable/CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES.txt
 share/doc/cmake/html/_sources/variable/CMAKE_CURRENT_BINARY_DIR.txt
+share/doc/cmake/html/_sources/variable/CMAKE_CURRENT_FUNCTION.txt
+share/doc/cmake/html/_sources/variable/CMAKE_CURRENT_FUNCTION_LIST_DIR.txt
+share/doc/cmake/html/_sources/variable/CMAKE_CURRENT_FUNCTION_LIST_FILE.txt
+share/doc/cmake/html/_sources/variable/CMAKE_CURRENT_FUNCTION_LIST_LINE.txt
 share/doc/cmake/html/_sources/variable/CMAKE_CURRENT_LIST_DIR.txt
 share/doc/cmake/html/_sources/variable/CMAKE_CURRENT_LIST_FILE.txt
 share/doc/cmake/html/_sources/variable/CMAKE_CURRENT_LIST_LINE.txt
@@ -3942,11 +4034,14 @@ 
share/doc/cmake/html/_sources/variable/CMAKE_C_STANDARD.txt
 share/doc/cmake/html/_sources/variable/CMAKE_C_STANDARD_REQUIRED.txt
 share/doc/cmake/html/_sources/variable/CMAKE_DEBUG_POSTFIX.txt
 share/doc/cmake/html/_sources/variable/CMAKE_DEBUG_TARGET_PROPERTIES.txt
+share/doc/cmake/html/_sources/variable/CMAKE_DEFAULT_BUILD_TYPE.txt
+share/doc/cmake/html/_sources/variable/CMAKE_DEFAULT_CONFIGS.txt
 share/doc/cmake/html/_sources/variable/CMAKE_DEPENDS_IN_PROJECT_ONLY.txt
 share/doc/cmake/html/_sources/variable/CMAKE_DIRECTORY_LABELS.txt
 
share/doc/cmake/html/_sources/variable/CMAKE_DISABLE_FIND_PACKAGE_PackageName.txt
 share/doc/cmake/html/_sources/variable/CMAKE_DISABLE_PRECOMPILE_HEADERS.txt
 share/doc/cmake/html/_sources/variable/CMAKE_DL_LIBS.txt
+share/doc/cmake/html/_sources/variable/CMAKE_DOTNET_TARGET_FRAMEWORK.txt
 
share/doc/cmake/html/_sources/variable/CMAKE_DOTNET_TARGET_FRAMEWORK_VERSION.txt
 
share/doc/cmake/html/_sources/variable/CMAKE_ECLIPSE_GENERATE_LINKED_RESOURCES.txt
 
share/doc/cmake/html/_sources/variable/CMAKE_ECLIPSE_GENERATE_SOURCE_PROJECT.txt
@@ -3969,6 +4064,7 @@ 
share/doc/cmake/html/_sources/variable/CMAKE_EXPORT_PACKAGE_REGISTRY.txt
 share/doc/cmake/html/_sources/variable/CMAKE_EXTRA_GENERATOR.txt
 share/doc/cmake/html/_sources/variable/CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES.txt
 share/doc/cmake/html/_sources/variable/CMAKE_FIND_APPBUNDLE.txt
+share/doc/cmake/html/_sources/variable/CMAKE_FIND_DEBUG_MODE.txt
 share/doc/cmake/html/_sources/variable/CMAKE_FIND_FRAMEWORK.txt
 share/doc/cmake/html/_sources/variable/CMAKE_FIND_LIBRARY_CUSTOM_LIB_SUFFIX.txt
 share/doc/cmake/html/_sources/variable/CMAKE_FIND_LIBRARY_PREFIXES.txt
@@ -4045,6 +4141,7 @@ 
share/doc/cmake/html/_sources/variable/CMAKE_IOS_INSTALL_COMBINED.txt
 share/doc/cmake/html/_sources/variable/CMAKE_JOB_POOLS.txt
 share/doc/cmake/html/_sources/variable/CMAKE_JOB_POOL_COMPILE.txt
 share/doc/cmake/html/_sources/variable/CMAKE_JOB_POOL_LINK.txt
+share/doc/cmake/html/_sources/variable/CMAKE_JOB_POOL_PRECOMPILE_HEADER.txt
 share/doc/cmake/html/_sources/variable/CMAKE_LANG_ANDROID_TOOLCHAIN_MACHINE.txt
 share/doc/cmake/html/_sources/variable/CMAKE_LANG_ANDROID_TOOLCHAIN_PREFIX.txt
 share/doc/cmake/html/_sources/variable/CMAKE_LANG_ANDROID_TOOLCHAIN_SUFFIX.txt
@@ -4131,7 +4228,10 @@ 
share/doc/cmake/html/_sources/variable/CMAKE_MAP_IMPORTED_CONFIG_CONFIG.txt
 share/doc/cmake/html/_sources/variable/CMAKE_MATCH_COUNT.txt
 share/doc/cmake/html/_sources/variable/CMAKE_MATCH_n.txt
 share/doc/cmake/html/_sources/variable/CMAKE_MAXIMUM_RECURSION_DEPTH.txt
+share/doc/cmake/html/_sources/variable/CMAKE_MESSAGE_CONTEXT.txt
+share/doc/cmake/html/_sources/variable/CMAKE_MESSAGE_CONTEXT_SHOW.txt
 share/doc/cmake/html/_sources/variable/CMAKE_MESSAGE_INDENT.txt
+share/doc/cmake/html/_sources/variable/CMAKE_MESSAGE_LOG_LEVEL.txt
 share/doc/cmake/html/_sources/variable/CMAKE_MFC_FLAG.txt
 share/doc/cmake/html/_sources/variable/CMAKE_MINIMUM_REQUIRED_VERSION.txt
 share/doc/cmake/html/_sources/variable/CMAKE_MINOR_VERSION.txt
@@ -4173,6 +4273,7 @@ 
share/doc/cmake/html/_sources/variable/CMAKE_PROJECT_INCLUDE.txt
 share/doc/cmake/html/_sources/variable/CMAKE_PROJECT_INCLUDE_BEFORE.txt
 share/doc/cmake/html/_sources/variable/CMAKE_PROJECT_NAME.txt
 share/doc/cmake/html/_sources/variable/CMAKE_PROJECT_PROJECT-NAME_INCLUDE.txt
+share/doc/cmake/html/_sources/variable/CMAKE_PROJECT_PROJECT-NAME_INCLUDE_BEFORE.txt
 share/doc/cmake/html/_sources/variable/CMAKE_PROJECT_VERSION.txt
 share/doc/cmake/html/_sources/variable/CMAKE_PROJECT_VERSION_MAJOR.txt
 share/doc/cmake/html/_sources/variable/CMAKE_PROJECT_VERSION_MINOR.txt
@@ -4277,6 +4378,7 @@ 
share/doc/cmake/html/_sources/variable/CMAKE_XCODE_SCHEME_DEBUG_DOCUMENT_VERSION
 
share/doc/cmake/html/_sources/variable/CMAKE_XCODE_SCHEME_DISABLE_MAIN_THREAD_CHECKER.txt
 
share/doc/cmake/html/_sources/variable/CMAKE_XCODE_SCHEME_DYNAMIC_LIBRARY_LOADS.txt
 
share/doc/cmake/html/_sources/variable/CMAKE_XCODE_SCHEME_DYNAMIC_LINKER_API_USAGE.txt
+share/doc/cmake/html/_sources/variable/CMAKE_XCODE_SCHEME_ENVIRONMENT.txt
 share/doc/cmake/html/_sources/variable/CMAKE_XCODE_SCHEME_GUARD_MALLOC.txt
 
share/doc/cmake/html/_sources/variable/CMAKE_XCODE_SCHEME_MAIN_THREAD_CHECKER_STOP.txt
 
share/doc/cmake/html/_sources/variable/CMAKE_XCODE_SCHEME_MALLOC_GUARD_EDGES.txt
@@ -4286,6 +4388,7 @@ 
share/doc/cmake/html/_sources/variable/CMAKE_XCODE_SCHEME_THREAD_SANITIZER.txt
 
share/doc/cmake/html/_sources/variable/CMAKE_XCODE_SCHEME_THREAD_SANITIZER_STOP.txt
 
share/doc/cmake/html/_sources/variable/CMAKE_XCODE_SCHEME_UNDEFINED_BEHAVIOUR_SANITIZER.txt
 
share/doc/cmake/html/_sources/variable/CMAKE_XCODE_SCHEME_UNDEFINED_BEHAVIOUR_SANITIZER_STOP.txt
+share/doc/cmake/html/_sources/variable/CMAKE_XCODE_SCHEME_WORKING_DIRECTORY.txt
 share/doc/cmake/html/_sources/variable/CMAKE_XCODE_SCHEME_ZOMBIE_OBJECTS.txt
 share/doc/cmake/html/_sources/variable/CPACK_ABSOLUTE_DESTINATION_FILES.txt
 
share/doc/cmake/html/_sources/variable/CPACK_COMPONENT_INCLUDE_TOPLEVEL_DIRECTORY.txt
@@ -4586,10 +4689,12 @@ share/doc/cmake/html/envvar/CC.html
 share/doc/cmake/html/envvar/CFLAGS.html
 share/doc/cmake/html/envvar/CMAKE_BUILD_PARALLEL_LEVEL.html
 share/doc/cmake/html/envvar/CMAKE_CONFIG_TYPE.html
+share/doc/cmake/html/envvar/CMAKE_EXPORT_COMPILE_COMMANDS.html
 share/doc/cmake/html/envvar/CMAKE_GENERATOR.html
 share/doc/cmake/html/envvar/CMAKE_GENERATOR_INSTANCE.html
 share/doc/cmake/html/envvar/CMAKE_GENERATOR_PLATFORM.html
 share/doc/cmake/html/envvar/CMAKE_GENERATOR_TOOLSET.html
+share/doc/cmake/html/envvar/CMAKE_LANG_COMPILER_LAUNCHER.html
 share/doc/cmake/html/envvar/CMAKE_MSVCIDE_RUN_PATH.html
 share/doc/cmake/html/envvar/CMAKE_NO_VERBOSE.html
 share/doc/cmake/html/envvar/CMAKE_OSX_ARCHITECTURES.html
@@ -4626,6 +4731,7 @@ share/doc/cmake/html/generator/MSYS Makefiles.html
 share/doc/cmake/html/generator/MinGW Makefiles.html
 share/doc/cmake/html/generator/NMake Makefiles JOM.html
 share/doc/cmake/html/generator/NMake Makefiles.html
+share/doc/cmake/html/generator/Ninja Multi-Config.html
 share/doc/cmake/html/generator/Ninja.html
 share/doc/cmake/html/generator/Sublime Text 2.html
 share/doc/cmake/html/generator/Unix Makefiles.html
@@ -4646,6 +4752,10 @@ share/doc/cmake/html/genindex.html
 share/doc/cmake/html/guide/
 share/doc/cmake/html/guide/tutorial/
 share/doc/cmake/html/guide/tutorial/index.html
+share/doc/cmake/html/guide/user-interaction/
+share/doc/cmake/html/guide/user-interaction/index.html
+share/doc/cmake/html/guide/using-dependencies/
+share/doc/cmake/html/guide/using-dependencies/index.html
 share/doc/cmake/html/index.html
 share/doc/cmake/html/manual/
 share/doc/cmake/html/manual/ccmake.1.html
@@ -4761,6 +4871,7 @@ share/doc/cmake/html/module/FindBoost.html
 share/doc/cmake/html/module/FindBullet.html
 share/doc/cmake/html/module/FindCABLE.html
 share/doc/cmake/html/module/FindCUDA.html
+share/doc/cmake/html/module/FindCUDAToolkit.html
 share/doc/cmake/html/module/FindCURL.html
 share/doc/cmake/html/module/FindCVS.html
 share/doc/cmake/html/module/FindCoin3D.html
@@ -5034,6 +5145,11 @@ share/doc/cmake/html/policy/CMP0094.html
 share/doc/cmake/html/policy/CMP0095.html
 share/doc/cmake/html/policy/CMP0096.html
 share/doc/cmake/html/policy/CMP0097.html
+share/doc/cmake/html/policy/CMP0098.html
+share/doc/cmake/html/policy/CMP0099.html
+share/doc/cmake/html/policy/CMP0100.html
+share/doc/cmake/html/policy/CMP0101.html
+share/doc/cmake/html/policy/CMP0102.html
 share/doc/cmake/html/prop_cache/
 share/doc/cmake/html/prop_cache/ADVANCED.html
 share/doc/cmake/html/prop_cache/HELPSTRING.html
@@ -5084,6 +5200,7 @@ share/doc/cmake/html/prop_gbl/AUTOGEN_TARGETS_FOLDER.html
 share/doc/cmake/html/prop_gbl/AUTOMOC_SOURCE_GROUP.html
 share/doc/cmake/html/prop_gbl/AUTOMOC_TARGETS_FOLDER.html
 share/doc/cmake/html/prop_gbl/AUTORCC_SOURCE_GROUP.html
+share/doc/cmake/html/prop_gbl/CMAKE_CUDA_KNOWN_FEATURES.html
 share/doc/cmake/html/prop_gbl/CMAKE_CXX_KNOWN_FEATURES.html
 share/doc/cmake/html/prop_gbl/CMAKE_C_KNOWN_FEATURES.html
 share/doc/cmake/html/prop_gbl/CMAKE_ROLE.html
@@ -5200,6 +5317,7 @@ share/doc/cmake/html/prop_test/WILL_FAIL.html
 share/doc/cmake/html/prop_test/WORKING_DIRECTORY.html
 share/doc/cmake/html/prop_tgt/
 share/doc/cmake/html/prop_tgt/ADDITIONAL_CLEAN_FILES.html
+share/doc/cmake/html/prop_tgt/AIX_EXPORT_ALL_SYMBOLS.html
 share/doc/cmake/html/prop_tgt/ALIASED_TARGET.html
 share/doc/cmake/html/prop_tgt/ANDROID_ANT_ADDITIONAL_OPTIONS.html
 share/doc/cmake/html/prop_tgt/ANDROID_API.html
@@ -5267,6 +5385,7 @@ share/doc/cmake/html/prop_tgt/CROSSCOMPILING_EMULATOR.html
 share/doc/cmake/html/prop_tgt/CUDA_EXTENSIONS.html
 share/doc/cmake/html/prop_tgt/CUDA_PTX_COMPILATION.html
 share/doc/cmake/html/prop_tgt/CUDA_RESOLVE_DEVICE_SYMBOLS.html
+share/doc/cmake/html/prop_tgt/CUDA_RUNTIME_LIBRARY.html
 share/doc/cmake/html/prop_tgt/CUDA_SEPARABLE_COMPILATION.html
 share/doc/cmake/html/prop_tgt/CUDA_STANDARD.html
 share/doc/cmake/html/prop_tgt/CUDA_STANDARD_REQUIRED.html
@@ -5280,7 +5399,9 @@ share/doc/cmake/html/prop_tgt/DEBUG_POSTFIX.html
 share/doc/cmake/html/prop_tgt/DEFINE_SYMBOL.html
 share/doc/cmake/html/prop_tgt/DEPLOYMENT_ADDITIONAL_FILES.html
 share/doc/cmake/html/prop_tgt/DEPLOYMENT_REMOTE_DIRECTORY.html
+share/doc/cmake/html/prop_tgt/DEPRECATION.html
 share/doc/cmake/html/prop_tgt/DISABLE_PRECOMPILE_HEADERS.html
+share/doc/cmake/html/prop_tgt/DOTNET_TARGET_FRAMEWORK.html
 share/doc/cmake/html/prop_tgt/DOTNET_TARGET_FRAMEWORK_VERSION.html
 share/doc/cmake/html/prop_tgt/ENABLE_EXPORTS.html
 share/doc/cmake/html/prop_tgt/EXCLUDE_FROM_ALL.html
@@ -5349,6 +5470,7 @@ 
share/doc/cmake/html/prop_tgt/INTERPROCEDURAL_OPTIMIZATION_CONFIG.html
 share/doc/cmake/html/prop_tgt/IOS_INSTALL_COMBINED.html
 share/doc/cmake/html/prop_tgt/JOB_POOL_COMPILE.html
 share/doc/cmake/html/prop_tgt/JOB_POOL_LINK.html
+share/doc/cmake/html/prop_tgt/JOB_POOL_PRECOMPILE_HEADER.html
 share/doc/cmake/html/prop_tgt/LABELS.html
 share/doc/cmake/html/prop_tgt/LANG_CLANG_TIDY.html
 share/doc/cmake/html/prop_tgt/LANG_COMPILER_LAUNCHER.html
@@ -5377,6 +5499,8 @@ 
share/doc/cmake/html/prop_tgt/LINK_SEARCH_START_STATIC.html
 share/doc/cmake/html/prop_tgt/LINK_WHAT_YOU_USE.html
 share/doc/cmake/html/prop_tgt/LOCATION.html
 share/doc/cmake/html/prop_tgt/LOCATION_CONFIG.html
+share/doc/cmake/html/prop_tgt/MACHO_COMPATIBILITY_VERSION.html
+share/doc/cmake/html/prop_tgt/MACHO_CURRENT_VERSION.html
 share/doc/cmake/html/prop_tgt/MACOSX_BUNDLE.html
 share/doc/cmake/html/prop_tgt/MACOSX_BUNDLE_INFO_PLIST.html
 share/doc/cmake/html/prop_tgt/MACOSX_FRAMEWORK_INFO_PLIST.html
@@ -5443,6 +5567,7 @@ 
share/doc/cmake/html/prop_tgt/VS_DEBUGGER_COMMAND_ARGUMENTS.html
 share/doc/cmake/html/prop_tgt/VS_DEBUGGER_ENVIRONMENT.html
 share/doc/cmake/html/prop_tgt/VS_DEBUGGER_WORKING_DIRECTORY.html
 share/doc/cmake/html/prop_tgt/VS_DESKTOP_EXTENSIONS_VERSION.html
+share/doc/cmake/html/prop_tgt/VS_DOTNET_DOCUMENTATION_FILE.html
 share/doc/cmake/html/prop_tgt/VS_DOTNET_REFERENCEPROP_refname_TAG_tagname.html
 share/doc/cmake/html/prop_tgt/VS_DOTNET_REFERENCES.html
 share/doc/cmake/html/prop_tgt/VS_DOTNET_REFERENCES_COPY_LOCAL.html
@@ -5496,6 +5621,7 @@ 
share/doc/cmake/html/prop_tgt/XCODE_SCHEME_THREAD_SANITIZER.html
 share/doc/cmake/html/prop_tgt/XCODE_SCHEME_THREAD_SANITIZER_STOP.html
 share/doc/cmake/html/prop_tgt/XCODE_SCHEME_UNDEFINED_BEHAVIOUR_SANITIZER.html
 
share/doc/cmake/html/prop_tgt/XCODE_SCHEME_UNDEFINED_BEHAVIOUR_SANITIZER_STOP.html
+share/doc/cmake/html/prop_tgt/XCODE_SCHEME_WORKING_DIRECTORY.html
 share/doc/cmake/html/prop_tgt/XCODE_SCHEME_ZOMBIE_OBJECTS.html
 share/doc/cmake/html/prop_tgt/XCTEST.html
 share/doc/cmake/html/release/
@@ -5508,6 +5634,7 @@ share/doc/cmake/html/release/3.13.html
 share/doc/cmake/html/release/3.14.html
 share/doc/cmake/html/release/3.15.html
 share/doc/cmake/html/release/3.16.html
+share/doc/cmake/html/release/3.17.html
 share/doc/cmake/html/release/3.2.html
 share/doc/cmake/html/release/3.3.html
 share/doc/cmake/html/release/3.4.html
@@ -5526,6 +5653,7 @@ share/doc/cmake/html/variable/BORLAND.html
 share/doc/cmake/html/variable/BUILD_SHARED_LIBS.html
 share/doc/cmake/html/variable/CACHE.html
 share/doc/cmake/html/variable/CMAKE_ABSOLUTE_DESTINATION_FILES.html
+share/doc/cmake/html/variable/CMAKE_AIX_EXPORT_ALL_SYMBOLS.html
 share/doc/cmake/html/variable/CMAKE_ANDROID_ANT_ADDITIONAL_OPTIONS.html
 share/doc/cmake/html/variable/CMAKE_ANDROID_API.html
 share/doc/cmake/html/variable/CMAKE_ANDROID_API_MIN.html
@@ -5602,15 +5730,23 @@ share/doc/cmake/html/variable/CMAKE_CONFIG_POSTFIX.html
 share/doc/cmake/html/variable/CMAKE_CPACK_COMMAND.html
 share/doc/cmake/html/variable/CMAKE_CROSSCOMPILING.html
 share/doc/cmake/html/variable/CMAKE_CROSSCOMPILING_EMULATOR.html
+share/doc/cmake/html/variable/CMAKE_CROSS_CONFIGS.html
+share/doc/cmake/html/variable/CMAKE_CTEST_ARGUMENTS.html
 share/doc/cmake/html/variable/CMAKE_CTEST_COMMAND.html
+share/doc/cmake/html/variable/CMAKE_CUDA_COMPILE_FEATURES.html
 share/doc/cmake/html/variable/CMAKE_CUDA_EXTENSIONS.html
 share/doc/cmake/html/variable/CMAKE_CUDA_HOST_COMPILER.html
 share/doc/cmake/html/variable/CMAKE_CUDA_RESOLVE_DEVICE_SYMBOLS.html
+share/doc/cmake/html/variable/CMAKE_CUDA_RUNTIME_LIBRARY.html
 share/doc/cmake/html/variable/CMAKE_CUDA_SEPARABLE_COMPILATION.html
 share/doc/cmake/html/variable/CMAKE_CUDA_STANDARD.html
 share/doc/cmake/html/variable/CMAKE_CUDA_STANDARD_REQUIRED.html
 share/doc/cmake/html/variable/CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES.html
 share/doc/cmake/html/variable/CMAKE_CURRENT_BINARY_DIR.html
+share/doc/cmake/html/variable/CMAKE_CURRENT_FUNCTION.html
+share/doc/cmake/html/variable/CMAKE_CURRENT_FUNCTION_LIST_DIR.html
+share/doc/cmake/html/variable/CMAKE_CURRENT_FUNCTION_LIST_FILE.html
+share/doc/cmake/html/variable/CMAKE_CURRENT_FUNCTION_LIST_LINE.html
 share/doc/cmake/html/variable/CMAKE_CURRENT_LIST_DIR.html
 share/doc/cmake/html/variable/CMAKE_CURRENT_LIST_FILE.html
 share/doc/cmake/html/variable/CMAKE_CURRENT_LIST_LINE.html
@@ -5625,11 +5761,14 @@ share/doc/cmake/html/variable/CMAKE_C_STANDARD.html
 share/doc/cmake/html/variable/CMAKE_C_STANDARD_REQUIRED.html
 share/doc/cmake/html/variable/CMAKE_DEBUG_POSTFIX.html
 share/doc/cmake/html/variable/CMAKE_DEBUG_TARGET_PROPERTIES.html
+share/doc/cmake/html/variable/CMAKE_DEFAULT_BUILD_TYPE.html
+share/doc/cmake/html/variable/CMAKE_DEFAULT_CONFIGS.html
 share/doc/cmake/html/variable/CMAKE_DEPENDS_IN_PROJECT_ONLY.html
 share/doc/cmake/html/variable/CMAKE_DIRECTORY_LABELS.html
 share/doc/cmake/html/variable/CMAKE_DISABLE_FIND_PACKAGE_PackageName.html
 share/doc/cmake/html/variable/CMAKE_DISABLE_PRECOMPILE_HEADERS.html
 share/doc/cmake/html/variable/CMAKE_DL_LIBS.html
+share/doc/cmake/html/variable/CMAKE_DOTNET_TARGET_FRAMEWORK.html
 share/doc/cmake/html/variable/CMAKE_DOTNET_TARGET_FRAMEWORK_VERSION.html
 share/doc/cmake/html/variable/CMAKE_ECLIPSE_GENERATE_LINKED_RESOURCES.html
 share/doc/cmake/html/variable/CMAKE_ECLIPSE_GENERATE_SOURCE_PROJECT.html
@@ -5652,6 +5791,7 @@ 
share/doc/cmake/html/variable/CMAKE_EXPORT_PACKAGE_REGISTRY.html
 share/doc/cmake/html/variable/CMAKE_EXTRA_GENERATOR.html
 share/doc/cmake/html/variable/CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES.html
 share/doc/cmake/html/variable/CMAKE_FIND_APPBUNDLE.html
+share/doc/cmake/html/variable/CMAKE_FIND_DEBUG_MODE.html
 share/doc/cmake/html/variable/CMAKE_FIND_FRAMEWORK.html
 share/doc/cmake/html/variable/CMAKE_FIND_LIBRARY_CUSTOM_LIB_SUFFIX.html
 share/doc/cmake/html/variable/CMAKE_FIND_LIBRARY_PREFIXES.html
@@ -5728,6 +5868,7 @@ 
share/doc/cmake/html/variable/CMAKE_IOS_INSTALL_COMBINED.html
 share/doc/cmake/html/variable/CMAKE_JOB_POOLS.html
 share/doc/cmake/html/variable/CMAKE_JOB_POOL_COMPILE.html
 share/doc/cmake/html/variable/CMAKE_JOB_POOL_LINK.html
+share/doc/cmake/html/variable/CMAKE_JOB_POOL_PRECOMPILE_HEADER.html
 share/doc/cmake/html/variable/CMAKE_LANG_ANDROID_TOOLCHAIN_MACHINE.html
 share/doc/cmake/html/variable/CMAKE_LANG_ANDROID_TOOLCHAIN_PREFIX.html
 share/doc/cmake/html/variable/CMAKE_LANG_ANDROID_TOOLCHAIN_SUFFIX.html
@@ -5814,7 +5955,10 @@ 
share/doc/cmake/html/variable/CMAKE_MAP_IMPORTED_CONFIG_CONFIG.html
 share/doc/cmake/html/variable/CMAKE_MATCH_COUNT.html
 share/doc/cmake/html/variable/CMAKE_MATCH_n.html
 share/doc/cmake/html/variable/CMAKE_MAXIMUM_RECURSION_DEPTH.html
+share/doc/cmake/html/variable/CMAKE_MESSAGE_CONTEXT.html
+share/doc/cmake/html/variable/CMAKE_MESSAGE_CONTEXT_SHOW.html
 share/doc/cmake/html/variable/CMAKE_MESSAGE_INDENT.html
+share/doc/cmake/html/variable/CMAKE_MESSAGE_LOG_LEVEL.html
 share/doc/cmake/html/variable/CMAKE_MFC_FLAG.html
 share/doc/cmake/html/variable/CMAKE_MINIMUM_REQUIRED_VERSION.html
 share/doc/cmake/html/variable/CMAKE_MINOR_VERSION.html
@@ -5856,6 +6000,7 @@ share/doc/cmake/html/variable/CMAKE_PROJECT_INCLUDE.html
 share/doc/cmake/html/variable/CMAKE_PROJECT_INCLUDE_BEFORE.html
 share/doc/cmake/html/variable/CMAKE_PROJECT_NAME.html
 share/doc/cmake/html/variable/CMAKE_PROJECT_PROJECT-NAME_INCLUDE.html
+share/doc/cmake/html/variable/CMAKE_PROJECT_PROJECT-NAME_INCLUDE_BEFORE.html
 share/doc/cmake/html/variable/CMAKE_PROJECT_VERSION.html
 share/doc/cmake/html/variable/CMAKE_PROJECT_VERSION_MAJOR.html
 share/doc/cmake/html/variable/CMAKE_PROJECT_VERSION_MINOR.html
@@ -5960,6 +6105,7 @@ 
share/doc/cmake/html/variable/CMAKE_XCODE_SCHEME_DEBUG_DOCUMENT_VERSIONING.html
 
share/doc/cmake/html/variable/CMAKE_XCODE_SCHEME_DISABLE_MAIN_THREAD_CHECKER.html
 share/doc/cmake/html/variable/CMAKE_XCODE_SCHEME_DYNAMIC_LIBRARY_LOADS.html
 share/doc/cmake/html/variable/CMAKE_XCODE_SCHEME_DYNAMIC_LINKER_API_USAGE.html
+share/doc/cmake/html/variable/CMAKE_XCODE_SCHEME_ENVIRONMENT.html
 share/doc/cmake/html/variable/CMAKE_XCODE_SCHEME_GUARD_MALLOC.html
 share/doc/cmake/html/variable/CMAKE_XCODE_SCHEME_MAIN_THREAD_CHECKER_STOP.html
 share/doc/cmake/html/variable/CMAKE_XCODE_SCHEME_MALLOC_GUARD_EDGES.html
@@ -5969,6 +6115,7 @@ 
share/doc/cmake/html/variable/CMAKE_XCODE_SCHEME_THREAD_SANITIZER.html
 share/doc/cmake/html/variable/CMAKE_XCODE_SCHEME_THREAD_SANITIZER_STOP.html
 
share/doc/cmake/html/variable/CMAKE_XCODE_SCHEME_UNDEFINED_BEHAVIOUR_SANITIZER.html
 
share/doc/cmake/html/variable/CMAKE_XCODE_SCHEME_UNDEFINED_BEHAVIOUR_SANITIZER_STOP.html
+share/doc/cmake/html/variable/CMAKE_XCODE_SCHEME_WORKING_DIRECTORY.html
 share/doc/cmake/html/variable/CMAKE_XCODE_SCHEME_ZOMBIE_OBJECTS.html
 share/doc/cmake/html/variable/CPACK_ABSOLUTE_DESTINATION_FILES.html
 share/doc/cmake/html/variable/CPACK_COMPONENT_INCLUDE_TOPLEVEL_DIRECTORY.html

UPDATE: devel/cmake (switch to py3, enable DEBUG_PACKAGES, new {py,ruby,lua,java} handling)

Reply via email to