Some of the more significant changes in CMake 3.7 are:

CMake now supports Cross Compiling for Android with simple toolchain files.
The “Ninja” generator learned to conditionally support Fortran when using a “ninja” tool that has the necessary features. See generator documentation for details.
The “if()” command gained new boolean comparison operations “LESS_EQUAL”, “GREATER_EQUAL”, “STRLESS_EQUAL”, “STRGREATER_EQUAL”, “VERSION_LESS_EQUAL”, and “VERSION_GREATER_EQUAL”.
The “try_compile()” command source file signature now honors configuration-specific flags (e.g. “CMAKE_<LANG>_FLAGS_DEBUG”) in the generated test project. Previously only the default such flags for the current toolchain were used. See policy “CMP0066”.
“Toolchain files” may now set “CMAKE_EXE_LINKER_FLAGS_INIT”, “CMAKE_SHARED_LINKER_FLAGS_INIT”, and “CMAKE_MODULE_LINKER_FLAGS_INIT” variables to initialize the “CMAKE_EXE_LINKER_FLAGS”, “CMAKE_SHARED_LINKER_FLAGS”, and “CMAKE_MODULE_LINKER_FLAGS” cache entries the first time a language is enabled in a build tree.
CTest now supports test fixtures through the new “FIXTURES_SETUP”, “FIXTURES_CLEANUP” and “FIXTURES_REQUIRED” test properties. When using regular expressions or “–rerun-failed” to limit the tests to be run, a fixture’s setup and cleanup tests will automatically be added to the execution set if any test requires that fixture.
We no longer provide Linux i386 binaries for download from “cmake.org” for new versions of CMake.
Vim support files “cmake-indent.vim”, “cmake-syntax.vim”, and “cmake-help.vim” have been removed in favor of the files now provided from the vim-cmake-syntax project.
Support for building CMake itself with some compilers was dropped:
Visual Studio 7.1 and 2005 — superseded by VS 2008 and above
MinGW.org mingw32 — superseded by MSYS2 mingw32 and mingw64
CMake still supports generating build systems for other projects using these compilers.

8 files changed, 131 insertions, 156 deletions

diff --git a/devel/cmake/Makefile b/devel/cmake/Makefile
index 978ce67b7a9..7f39cd78e86 100644
--- a/devel/cmake/Makefile
+++ b/devel/cmake/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.124 2016/11/04 20:41:09 adam Exp $
+# $NetBSD: Makefile,v 1.125 2016/11/12 07:49:18 adam Exp $
 
 .include "Makefile.version"
 
@@ -31,7 +31,7 @@ LDFLAGS.SunOS+=		-lsocket -lnsl
 .include "../../mk/bsd.prefs.mk"
 
 .if !empty(MAKE_JOBS)
-CONFIGURE_ARGS+=	--parallel=${MAKE_JOBS:Q}
+CONFIGURE_ARGS+=	--parallel=${MAKE_JOBS}
 .endif
 
 PLIST_SUBST+=		CMAKE_API=${CMAKE_API}
@@ -68,7 +68,8 @@ INCOMPAT_CURSES=	NetBSD-[0-7].*-*
 BUILDLINK_API_DEPENDS.libarchive+=	libarchive>=3.0.0
 .include "../../archivers/libarchive/buildlink3.mk"
 .include "../../devel/libexecinfo/buildlink3.mk"
-.include "../../mk/curses.buildlink3.mk"
+.include "../../devel/libuv/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
+.include "../../mk/curses.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/cmake/Makefile.version b/devel/cmake/Makefile.version
index 5d2ccec1de8..083c93191af 100644
--- a/devel/cmake/Makefile.version
+++ b/devel/cmake/Makefile.version
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.version,v 1.3 2016/11/04 20:41:09 adam Exp $
+# $NetBSD: Makefile.version,v 1.4 2016/11/12 07:49:18 adam Exp $
 #
 # used by devel/cmake/Makefile
 # used by devel/cmake-fedora/Makefile
-CMAKE_VERSION=	3.6.3
+CMAKE_VERSION=	3.7.0
 CMAKE_API=	${CMAKE_VERSION:R}
diff --git a/devel/cmake/PLIST b/devel/cmake/PLIST
index 16914d0e87b..584e4780ee8 100644
--- a/devel/cmake/PLIST
+++ b/devel/cmake/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.42 2016/07/28 17:44:43 prlw1 Exp $
+@comment $NetBSD: PLIST,v 1.43 2016/11/12 07:49:18 adam Exp $
 bin/ccmake
 bin/cmake
 bin/cpack
@@ -142,6 +142,7 @@ share/cmake-${CMAKE_API}/Help/generator/Visual Studio 10 2010.rst
 share/cmake-${CMAKE_API}/Help/generator/Visual Studio 11 2012.rst
 share/cmake-${CMAKE_API}/Help/generator/Visual Studio 12 2013.rst
 share/cmake-${CMAKE_API}/Help/generator/Visual Studio 14 2015.rst
+share/cmake-${CMAKE_API}/Help/generator/Visual Studio 15.rst
 share/cmake-${CMAKE_API}/Help/generator/Visual Studio 6.rst
 share/cmake-${CMAKE_API}/Help/generator/Visual Studio 7 .NET 2003.rst
 share/cmake-${CMAKE_API}/Help/generator/Visual Studio 7.rst
@@ -170,12 +171,14 @@ share/cmake-${CMAKE_API}/Help/manual/cmake-packages.7.rst
 share/cmake-${CMAKE_API}/Help/manual/cmake-policies.7.rst
 share/cmake-${CMAKE_API}/Help/manual/cmake-properties.7.rst
 share/cmake-${CMAKE_API}/Help/manual/cmake-qt.7.rst
+share/cmake-${CMAKE_API}/Help/manual/cmake-server.7.rst
 share/cmake-${CMAKE_API}/Help/manual/cmake-toolchains.7.rst
 share/cmake-${CMAKE_API}/Help/manual/cmake-variables.7.rst
 share/cmake-${CMAKE_API}/Help/manual/cmake.1.rst
 share/cmake-${CMAKE_API}/Help/manual/cpack.1.rst
 share/cmake-${CMAKE_API}/Help/manual/ctest.1.rst
 share/cmake-${CMAKE_API}/Help/module/AddFileDependencies.rst
+share/cmake-${CMAKE_API}/Help/module/AndroidTestUtilities.rst
 share/cmake-${CMAKE_API}/Help/module/BundleUtilities.rst
 share/cmake-${CMAKE_API}/Help/module/CMakeAddFortranSubdirectory.rst
 share/cmake-${CMAKE_API}/Help/module/CMakeBackwardCompatibilityCXX.rst
@@ -202,6 +205,7 @@ share/cmake-${CMAKE_API}/Help/module/CPackDeb.rst
 share/cmake-${CMAKE_API}/Help/module/CPackIFW.rst
 share/cmake-${CMAKE_API}/Help/module/CPackNSIS.rst
 share/cmake-${CMAKE_API}/Help/module/CPackPackageMaker.rst
+share/cmake-${CMAKE_API}/Help/module/CPackProductBuild.rst
 share/cmake-${CMAKE_API}/Help/module/CPackRPM.rst
 share/cmake-${CMAKE_API}/Help/module/CPackWIX.rst
 share/cmake-${CMAKE_API}/Help/module/CTest.rst
@@ -280,6 +284,7 @@ share/cmake-${CMAKE_API}/Help/module/FindHDF5.rst
 share/cmake-${CMAKE_API}/Help/module/FindHSPELL.rst
 share/cmake-${CMAKE_API}/Help/module/FindHTMLHelp.rst
 share/cmake-${CMAKE_API}/Help/module/FindHg.rst
+share/cmake-${CMAKE_API}/Help/module/FindICU.rst
 share/cmake-${CMAKE_API}/Help/module/FindITK.rst
 share/cmake-${CMAKE_API}/Help/module/FindIce.rst
 share/cmake-${CMAKE_API}/Help/module/FindIcotool.rst
@@ -351,6 +356,7 @@ share/cmake-${CMAKE_API}/Help/module/FindTclsh.rst
 share/cmake-${CMAKE_API}/Help/module/FindThreads.rst
 share/cmake-${CMAKE_API}/Help/module/FindUnixCommands.rst
 share/cmake-${CMAKE_API}/Help/module/FindVTK.rst
+share/cmake-${CMAKE_API}/Help/module/FindVulkan.rst
 share/cmake-${CMAKE_API}/Help/module/FindWget.rst
 share/cmake-${CMAKE_API}/Help/module/FindWish.rst
 share/cmake-${CMAKE_API}/Help/module/FindX11.rst
@@ -472,6 +478,7 @@ share/cmake-${CMAKE_API}/Help/policy/CMP0062.rst
 share/cmake-${CMAKE_API}/Help/policy/CMP0063.rst
 share/cmake-${CMAKE_API}/Help/policy/CMP0064.rst
 share/cmake-${CMAKE_API}/Help/policy/CMP0065.rst
+share/cmake-${CMAKE_API}/Help/policy/CMP0066.rst
 share/cmake-${CMAKE_API}/Help/policy/DEPRECATED.txt
 share/cmake-${CMAKE_API}/Help/policy/DISALLOWED_COMMAND.txt
 share/cmake-${CMAKE_API}/Help/prop_cache/ADVANCED.rst
@@ -481,6 +488,8 @@ share/cmake-${CMAKE_API}/Help/prop_cache/STRINGS.rst
 share/cmake-${CMAKE_API}/Help/prop_cache/TYPE.rst
 share/cmake-${CMAKE_API}/Help/prop_cache/VALUE.rst
 share/cmake-${CMAKE_API}/Help/prop_dir/ADDITIONAL_MAKE_CLEAN_FILES.rst
+share/cmake-${CMAKE_API}/Help/prop_dir/BINARY_DIR.rst
+share/cmake-${CMAKE_API}/Help/prop_dir/BUILDSYSTEM_TARGETS.rst
 share/cmake-${CMAKE_API}/Help/prop_dir/CACHE_VARIABLES.rst
 share/cmake-${CMAKE_API}/Help/prop_dir/CLEAN_NO_CUSTOM.rst
 share/cmake-${CMAKE_API}/Help/prop_dir/CMAKE_CONFIGURE_DEPENDS.rst
@@ -501,6 +510,8 @@ share/cmake-${CMAKE_API}/Help/prop_dir/PARENT_DIRECTORY.rst
 share/cmake-${CMAKE_API}/Help/prop_dir/RULE_LAUNCH_COMPILE.rst
 share/cmake-${CMAKE_API}/Help/prop_dir/RULE_LAUNCH_CUSTOM.rst
 share/cmake-${CMAKE_API}/Help/prop_dir/RULE_LAUNCH_LINK.rst
+share/cmake-${CMAKE_API}/Help/prop_dir/SOURCE_DIR.rst
+share/cmake-${CMAKE_API}/Help/prop_dir/SUBDIRECTORIES.rst
 share/cmake-${CMAKE_API}/Help/prop_dir/TEST_INCLUDE_FILE.rst
 share/cmake-${CMAKE_API}/Help/prop_dir/VARIABLES.rst
 share/cmake-${CMAKE_API}/Help/prop_dir/VS_GLOBAL_SECTION_POST_section.rst
@@ -516,6 +527,7 @@ share/cmake-${CMAKE_API}/Help/prop_gbl/DISABLED_FEATURES.rst
 share/cmake-${CMAKE_API}/Help/prop_gbl/ECLIPSE_EXTRA_NATURES.rst
 share/cmake-${CMAKE_API}/Help/prop_gbl/ENABLED_FEATURES.rst
 share/cmake-${CMAKE_API}/Help/prop_gbl/ENABLED_LANGUAGES.rst
+share/cmake-${CMAKE_API}/Help/prop_gbl/FIND_LIBRARY_USE_LIB32_PATHS.rst
 share/cmake-${CMAKE_API}/Help/prop_gbl/FIND_LIBRARY_USE_LIB64_PATHS.rst
 share/cmake-${CMAKE_API}/Help/prop_gbl/FIND_LIBRARY_USE_OPENBSD_VERSIONING.rst
 share/cmake-${CMAKE_API}/Help/prop_gbl/GLOBAL_DEPENDS_DEBUG_MODE.rst
@@ -564,9 +576,11 @@ share/cmake-${CMAKE_API}/Help/prop_sf/VS_SHADER_ENTRYPOINT.rst
 share/cmake-${CMAKE_API}/Help/prop_sf/VS_SHADER_FLAGS.rst
 share/cmake-${CMAKE_API}/Help/prop_sf/VS_SHADER_MODEL.rst
 share/cmake-${CMAKE_API}/Help/prop_sf/VS_SHADER_TYPE.rst
+share/cmake-${CMAKE_API}/Help/prop_sf/VS_TOOL_OVERRIDE.rst
 share/cmake-${CMAKE_API}/Help/prop_sf/VS_XAML_TYPE.rst
 share/cmake-${CMAKE_API}/Help/prop_sf/WRAP_EXCLUDE.rst
 share/cmake-${CMAKE_API}/Help/prop_sf/XCODE_EXPLICIT_FILE_TYPE.rst
+share/cmake-${CMAKE_API}/Help/prop_sf/XCODE_FILE_ATTRIBUTES.rst
 share/cmake-${CMAKE_API}/Help/prop_sf/XCODE_LAST_KNOWN_FILE_TYPE.rst
 share/cmake-${CMAKE_API}/Help/prop_test/ATTACHED_FILES.rst
 share/cmake-${CMAKE_API}/Help/prop_test/ATTACHED_FILES_ON_FAIL.rst
@@ -574,6 +588,9 @@ share/cmake-${CMAKE_API}/Help/prop_test/COST.rst
 share/cmake-${CMAKE_API}/Help/prop_test/DEPENDS.rst
 share/cmake-${CMAKE_API}/Help/prop_test/ENVIRONMENT.rst
 share/cmake-${CMAKE_API}/Help/prop_test/FAIL_REGULAR_EXPRESSION.rst
+share/cmake-${CMAKE_API}/Help/prop_test/FIXTURES_CLEANUP.rst
+share/cmake-${CMAKE_API}/Help/prop_test/FIXTURES_REQUIRED.rst
+share/cmake-${CMAKE_API}/Help/prop_test/FIXTURES_SETUP.rst
 share/cmake-${CMAKE_API}/Help/prop_test/LABELS.rst
 share/cmake-${CMAKE_API}/Help/prop_test/MEASUREMENT.rst
 share/cmake-${CMAKE_API}/Help/prop_test/PASS_REGULAR_EXPRESSION.rst
@@ -720,6 +737,7 @@ share/cmake-${CMAKE_API}/Help/prop_tgt/LINK_INTERFACE_MULTIPLICITY_CONFIG.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/LINK_LIBRARIES.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/LINK_SEARCH_END_STATIC.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/LINK_SEARCH_START_STATIC.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/LINK_WHAT_YOU_USE.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/LOCATION.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/LOCATION_CONFIG.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/MACOSX_BUNDLE.rst
@@ -780,6 +798,7 @@ share/cmake-${CMAKE_API}/Help/prop_tgt/VS_SCC_AUXPATH.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/VS_SCC_LOCALPATH.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/VS_SCC_PROJECTNAME.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/VS_SCC_PROVIDER.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/VS_SDK_REFERENCES.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/VS_WINDOWS_TARGET_PLATFORM_MIN_VERSION.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/VS_WINRT_COMPONENT.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/VS_WINRT_EXTENSIONS.rst
@@ -797,8 +816,10 @@ share/cmake-${CMAKE_API}/Help/release/3.3.rst
 share/cmake-${CMAKE_API}/Help/release/3.4.rst
 share/cmake-${CMAKE_API}/Help/release/3.5.rst
 share/cmake-${CMAKE_API}/Help/release/${CMAKE_API}.rst
+share/cmake-${CMAKE_API}/Help/release/3.6.rst
 share/cmake-${CMAKE_API}/Help/release/dev.txt
 share/cmake-${CMAKE_API}/Help/release/index.rst
+share/cmake-${CMAKE_API}/Help/variable/ANDROID.rst
 share/cmake-${CMAKE_API}/Help/variable/APPLE.rst
 share/cmake-${CMAKE_API}/Help/variable/BORLAND.rst
 share/cmake-${CMAKE_API}/Help/variable/BUILD_SHARED_LIBS.rst
@@ -807,6 +828,9 @@ share/cmake-${CMAKE_API}/Help/variable/CMAKE_ANDROID_ANT_ADDITIONAL_OPTIONS.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_ANDROID_API.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_ANDROID_API_MIN.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_ANDROID_ARCH.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_ANDROID_ARCH_ABI.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_ANDROID_ARM_MODE.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_ANDROID_ARM_NEON.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_ANDROID_ASSETS_DIRECTORIES.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_ANDROID_GUI.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_ANDROID_JAR_DEPENDENCIES.rst
@@ -814,11 +838,14 @@ share/cmake-${CMAKE_API}/Help/variable/CMAKE_ANDROID_JAR_DIRECTORIES.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_ANDROID_JAVA_SOURCE_DIR.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_ANDROID_NATIVE_LIB_DEPENDENCIES.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_ANDROID_NATIVE_LIB_DIRECTORIES.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_ANDROID_NDK.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_ANDROID_PROCESS_MAX.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_ANDROID_PROGUARD.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_ANDROID_PROGUARD_CONFIG_PATH.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_ANDROID_SECURE_PROPS_PATH.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_ANDROID_SKIP_ANT_STEP.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_ANDROID_STANDALONE_TOOLCHAIN.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_ANDROID_STL_TYPE.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_APPBUNDLE_PATH.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_AR.rst
@@ -844,10 +871,13 @@ share/cmake-${CMAKE_API}/Help/variable/CMAKE_CACHE_MINOR_VERSION.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_CACHE_PATCH_VERSION.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_CFG_INTDIR.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_CL_64.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_CODELITE_USE_TARGETS.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_COLOR_MAKEFILE.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_COMMAND.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_COMPILER_2005.rst
-share/cmake-${CMAKE_API}/Help/variable/CMAKE_COMPILER_IS_GNULANG.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_COMPILER_IS_GNUCC.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_COMPILER_IS_GNUCXX.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_COMPILER_IS_GNUG77.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY_CONFIG.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_CONFIGURATION_TYPES.rst
@@ -884,6 +914,8 @@ share/cmake-${CMAKE_API}/Help/variable/CMAKE_ERROR_ON_ABSOLUTE_INSTALL_DESTINATI
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_EXECUTABLE_SUFFIX.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_EXE_LINKER_FLAGS.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_EXE_LINKER_FLAGS_CONFIG.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_EXE_LINKER_FLAGS_CONFIG_INIT.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_EXE_LINKER_FLAGS_INIT.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_EXPORT_COMPILE_COMMANDS.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_EXPORT_NO_PACKAGE_REGISTRY.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_EXTRA_GENERATOR.rst
@@ -896,6 +928,8 @@ share/cmake-${CMAKE_API}/Help/variable/CMAKE_FIND_NO_INSTALL_PREFIX.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_FIND_PACKAGE_NAME.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_FIND_PACKAGE_SORT_DIRECTION.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_FIND_PACKAGE_SORT_ORDER.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_FIND_PACKAGE_WARN_NO_MODULE.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_FIND_ROOT_PATH.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_FIND_ROOT_PATH_MODE_INCLUDE.rst
@@ -940,6 +974,8 @@ share/cmake-${CMAKE_API}/Help/variable/CMAKE_INTERNAL_PLATFORM_ABI.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_IOS_INSTALL_COMBINED.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_JOB_POOL_COMPILE.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_JOB_POOL_LINK.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_LANG_ANDROID_TOOLCHAIN_PREFIX.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_LANG_ANDROID_TOOLCHAIN_SUFFIX.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_LANG_ARCHIVE_APPEND.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_LANG_ARCHIVE_CREATE.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_LANG_ARCHIVE_FINISH.rst
@@ -958,9 +994,14 @@ share/cmake-${CMAKE_API}/Help/variable/CMAKE_LANG_CREATE_SHARED_MODULE.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_LANG_CREATE_STATIC_LIBRARY.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_LANG_FLAGS.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_LANG_FLAGS_DEBUG.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_LANG_FLAGS_DEBUG_INIT.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_LANG_FLAGS_INIT.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_LANG_FLAGS_MINSIZEREL.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_LANG_FLAGS_MINSIZEREL_INIT.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_LANG_FLAGS_RELEASE.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_LANG_FLAGS_RELEASE_INIT.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_LANG_FLAGS_RELWITHDEBINFO.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_LANG_FLAGS_RELWITHDEBINFO_INIT.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_LANG_GHS_KERNEL_FLAGS_DEBUG.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_LANG_GHS_KERNEL_FLAGS_MINSIZEREL.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_LANG_GHS_KERNEL_FLAGS_RELEASE.rst
@@ -998,6 +1039,7 @@ share/cmake-${CMAKE_API}/Help/variable/CMAKE_LINK_LIBRARY_FLAG.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_LINK_LIBRARY_SUFFIX.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_LINK_SEARCH_END_STATIC.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_LINK_SEARCH_START_STATIC.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_LINK_WHAT_YOU_USE.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_MACOSX_BUNDLE.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_MACOSX_RPATH.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_MAJOR_VERSION.rst
@@ -1009,6 +1051,8 @@ share/cmake-${CMAKE_API}/Help/variable/CMAKE_MINIMUM_REQUIRED_VERSION.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_MINOR_VERSION.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_MODULE_LINKER_FLAGS.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_MODULE_LINKER_FLAGS_CONFIG.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_MODULE_LINKER_FLAGS_CONFIG_INIT.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_MODULE_LINKER_FLAGS_INIT.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_MODULE_PATH.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_NINJA_OUTPUT_PATH_PREFIX.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_NOT_USING_CONFIG_FLAGS.rst
@@ -1039,6 +1083,8 @@ share/cmake-${CMAKE_API}/Help/variable/CMAKE_SHARED_LIBRARY_PREFIX.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_SHARED_LIBRARY_SUFFIX.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_SHARED_LINKER_FLAGS.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_SHARED_LINKER_FLAGS_CONFIG.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_SHARED_LINKER_FLAGS_CONFIG_INIT.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_SHARED_LINKER_FLAGS_INIT.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_SHARED_MODULE_PREFIX.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_SHARED_MODULE_SUFFIX.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_SIZEOF_VOID_P.rst
@@ -1053,6 +1099,8 @@ share/cmake-${CMAKE_API}/Help/variable/CMAKE_STATIC_LIBRARY_PREFIX.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_STATIC_LIBRARY_SUFFIX.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_STATIC_LINKER_FLAGS.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_STATIC_LINKER_FLAGS_CONFIG.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_STATIC_LINKER_FLAGS_CONFIG_INIT.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_STATIC_LINKER_FLAGS_INIT.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_SYSROOT.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_SYSTEM.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_SYSTEM_APPBUNDLE_PATH.rst
@@ -1065,6 +1113,7 @@ share/cmake-${CMAKE_API}/Help/variable/CMAKE_SYSTEM_PREFIX_PATH.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_SYSTEM_PROCESSOR.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_SYSTEM_PROGRAM_PATH.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_SYSTEM_VERSION.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_Swift_LANGUAGE_VERSION.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_TOOLCHAIN_FILE.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_TRY_COMPILE_CONFIGURATION.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_TRY_COMPILE_PLATFORM_VARIABLES.rst
@@ -1205,9 +1254,12 @@ share/cmake-${CMAKE_API}/Help/variable/WIN32.rst
 share/cmake-${CMAKE_API}/Help/variable/WINCE.rst
 share/cmake-${CMAKE_API}/Help/variable/WINDOWS_PHONE.rst
 share/cmake-${CMAKE_API}/Help/variable/WINDOWS_STORE.rst
+share/cmake-${CMAKE_API}/Help/variable/XCODE.rst
 share/cmake-${CMAKE_API}/Help/variable/XCODE_VERSION.rst
 share/cmake-${CMAKE_API}/Modules/.NoDartCoverage
 share/cmake-${CMAKE_API}/Modules/AddFileDependencies.cmake
+share/cmake-${CMAKE_API}/Modules/AndroidTestUtilities.cmake
+share/cmake-${CMAKE_API}/Modules/AndroidTestUtilities/PushToAndroidDevice.cmake
 share/cmake-${CMAKE_API}/Modules/AutogenInfo.cmake.in
 share/cmake-${CMAKE_API}/Modules/BasicConfigVersion-AnyNewerVersion.cmake.in
 share/cmake-${CMAKE_API}/Modules/BasicConfigVersion-ExactVersion.cmake.in
@@ -1338,6 +1390,7 @@ share/cmake-${CMAKE_API}/Modules/CPackDeb.cmake
 share/cmake-${CMAKE_API}/Modules/CPackIFW.cmake
 share/cmake-${CMAKE_API}/Modules/CPackNSIS.cmake
 share/cmake-${CMAKE_API}/Modules/CPackPackageMaker.cmake
+share/cmake-${CMAKE_API}/Modules/CPackProductBuild.cmake
 share/cmake-${CMAKE_API}/Modules/CPackRPM.cmake
 share/cmake-${CMAKE_API}/Modules/CPackWIX.cmake
 share/cmake-${CMAKE_API}/Modules/CPackZIP.cmake
@@ -1461,6 +1514,7 @@ share/cmake-${CMAKE_API}/Modules/Compiler/Intel-CXX-FeatureTests.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/Intel-CXX.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/Intel-DetermineCompiler.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/Intel-Fortran.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/Intel.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/MIPSpro-C.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/MIPSpro-CXX.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/MIPSpro-DetermineCompiler.cmake
@@ -1551,6 +1605,7 @@ share/cmake-${CMAKE_API}/Modules/FindCUDA.cmake
 share/cmake-${CMAKE_API}/Modules/FindCUDA/make2cmake.cmake
 share/cmake-${CMAKE_API}/Modules/FindCUDA/parse_cubin.cmake
 share/cmake-${CMAKE_API}/Modules/FindCUDA/run_nvcc.cmake
+share/cmake-${CMAKE_API}/Modules/FindCUDA/select_compute_arch.cmake
 share/cmake-${CMAKE_API}/Modules/FindCURL.cmake
 share/cmake-${CMAKE_API}/Modules/FindCVS.cmake
 share/cmake-${CMAKE_API}/Modules/FindCoin3D.cmake
@@ -1585,6 +1640,7 @@ share/cmake-${CMAKE_API}/Modules/FindHDF5.cmake
 share/cmake-${CMAKE_API}/Modules/FindHSPELL.cmake
 share/cmake-${CMAKE_API}/Modules/FindHTMLHelp.cmake
 share/cmake-${CMAKE_API}/Modules/FindHg.cmake
+share/cmake-${CMAKE_API}/Modules/FindICU.cmake
 share/cmake-${CMAKE_API}/Modules/FindIce.cmake
 share/cmake-${CMAKE_API}/Modules/FindIcotool.cmake
 share/cmake-${CMAKE_API}/Modules/FindImageMagick.cmake
@@ -1654,6 +1710,7 @@ share/cmake-${CMAKE_API}/Modules/FindTclStub.cmake
 share/cmake-${CMAKE_API}/Modules/FindTclsh.cmake
 share/cmake-${CMAKE_API}/Modules/FindThreads.cmake
 share/cmake-${CMAKE_API}/Modules/FindUnixCommands.cmake
+share/cmake-${CMAKE_API}/Modules/FindVulkan.cmake
 share/cmake-${CMAKE_API}/Modules/FindWget.cmake
 share/cmake-${CMAKE_API}/Modules/FindWish.cmake
 share/cmake-${CMAKE_API}/Modules/FindX11.cmake
@@ -1721,6 +1778,8 @@ share/cmake-${CMAKE_API}/Modules/MacroAddFileDependencies.cmake
 share/cmake-${CMAKE_API}/Modules/MatlabTestsRedirect.cmake
 share/cmake-${CMAKE_API}/Modules/NSIS.InstallOptions.ini.in
 share/cmake-${CMAKE_API}/Modules/NSIS.template.in
+share/cmake-${CMAKE_API}/Modules/Platform/AIX-Clang-C.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/AIX-Clang-CXX.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/AIX-GNU-ASM.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/AIX-GNU-C.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/AIX-GNU-CXX.cmake
@@ -1737,7 +1796,54 @@ share/cmake-${CMAKE_API}/Modules/Platform/AIX-XL.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/AIX.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/ARTOS-GNU-C.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/ARTOS.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Android-Clang-C.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Android-Clang-CXX.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Android-Clang.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Android-Common.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Android-Determine-C.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Android-Determine-CXX.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Android-Determine.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Android-GNU-C.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Android-GNU-CXX.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Android-GNU.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Android-Initialize.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Android.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Android/Determine-Compiler-NDK.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Android/Determine-Compiler-Standalone.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Android/Determine-Compiler.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Android/abi-arm64-v8a-Clang.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Android/abi-arm64-v8a-GNU.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Android/abi-armeabi-Clang.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Android/abi-armeabi-GNU.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Android/abi-armeabi-v6-Clang.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Android/abi-armeabi-v6-GNU.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Android/abi-armeabi-v7a-Clang.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Android/abi-armeabi-v7a-GNU.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Android/abi-common-Clang.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Android/abi-common-GNU.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Android/abi-common.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Android/abi-mips-Clang.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Android/abi-mips-GNU.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Android/abi-mips64-Clang.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Android/abi-mips64-GNU.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Android/abi-x86-Clang.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Android/abi-x86-GNU.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Android/abi-x86_64-Clang.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Android/abi-x86_64-GNU.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Android/ndk-stl-c++.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Android/ndk-stl-c++_shared.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Android/ndk-stl-c++_static.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Android/ndk-stl-gabi++.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Android/ndk-stl-gabi++_shared.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Android/ndk-stl-gabi++_static.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Android/ndk-stl-gnustl.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Android/ndk-stl-gnustl_shared.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Android/ndk-stl-gnustl_static.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Android/ndk-stl-none.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Android/ndk-stl-stlport.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Android/ndk-stl-stlport_shared.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Android/ndk-stl-stlport_static.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Android/ndk-stl-system.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/BSDOS.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/BeOS.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/BlueGeneL.cmake
@@ -1771,9 +1877,9 @@ share/cmake-${CMAKE_API}/Modules/Platform/BlueGeneQ-static-XL-C.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/BlueGeneQ-static-XL-CXX.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/BlueGeneQ-static-XL-Fortran.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/BlueGeneQ-static.cmake
-share/cmake-${CMAKE_API}/Modules/Platform/CYGWIN-CXX.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/CYGWIN-Clang-C.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/CYGWIN-Clang-CXX.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/CYGWIN-Determine-CXX.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/CYGWIN-GNU-C.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/CYGWIN-GNU-CXX.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/CYGWIN-GNU-Fortran.cmake
@@ -1785,10 +1891,10 @@ share/cmake-${CMAKE_API}/Modules/Platform/CrayLinuxEnvironment.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Darwin-Absoft-Fortran.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Darwin-AppleClang-C.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Darwin-AppleClang-CXX.cmake
-share/cmake-${CMAKE_API}/Modules/Platform/Darwin-CXX.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Darwin-Clang-C.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Darwin-Clang-CXX.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Darwin-Clang.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Darwin-Determine-CXX.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Darwin-GNU-C.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Darwin-GNU-CXX.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Darwin-GNU-Fortran.cmake
@@ -1834,9 +1940,9 @@ share/cmake-${CMAKE_API}/Modules/Platform/IRIX.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/IRIX64.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Linux-Absoft-Fortran.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Linux-CCur-Fortran.cmake
-share/cmake-${CMAKE_API}/Modules/Platform/Linux-CXX.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Linux-Clang-C.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Linux-Clang-CXX.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Linux-Determine-CXX.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Linux-GNU-C.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Linux-GNU-CXX.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Linux-GNU-Fortran.cmake
@@ -1893,10 +1999,10 @@ share/cmake-${CMAKE_API}/Modules/Platform/UnixPaths.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/UnixWare.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Windows-Borland-C.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Windows-Borland-CXX.cmake
-share/cmake-${CMAKE_API}/Modules/Platform/Windows-CXX.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Windows-Clang-C.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Windows-Clang-CXX.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Windows-Clang.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Windows-Determine-CXX.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Windows-Embarcadero-C.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Windows-Embarcadero-CXX.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Windows-Embarcadero.cmake
@@ -1917,8 +2023,12 @@ share/cmake-${CMAKE_API}/Modules/Platform/Windows-MSVC-C.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Windows-MSVC-CXX.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Windows-MSVC.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Windows-NMcl.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Windows-OpenWatcom-C.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Windows-OpenWatcom-CXX.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Windows-OpenWatcom.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Windows-Watcom-C.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Windows-Watcom-CXX.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Windows-df.cmake
-share/cmake-${CMAKE_API}/Modules/Platform/Windows-wcl386.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Windows-windres.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Windows.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/WindowsCE-MSVC-C.cmake
@@ -1974,6 +2084,7 @@ share/cmake-${CMAKE_API}/Modules/WriteBasicConfigVersionFile.cmake
 share/cmake-${CMAKE_API}/Modules/WriteCompilerDetectionHeader.cmake
 share/cmake-${CMAKE_API}/Modules/ecos_clean.cmake
 share/cmake-${CMAKE_API}/Modules/exportheader.cmake.in
+share/cmake-${CMAKE_API}/Modules/javaTargets.cmake.in
 share/cmake-${CMAKE_API}/Modules/kde3init_dummy.cpp.in
 share/cmake-${CMAKE_API}/Modules/kde3uic.cmake
 share/cmake-${CMAKE_API}/Modules/readme.txt
@@ -1993,14 +2104,12 @@ share/cmake-${CMAKE_API}/Templates/Windows/SmallLogo44x44.png
 share/cmake-${CMAKE_API}/Templates/Windows/SplashScreen.png
 share/cmake-${CMAKE_API}/Templates/Windows/StoreLogo.png
 share/cmake-${CMAKE_API}/Templates/Windows/Windows_TemporaryKey.pfx
-share/cmake-${CMAKE_API}/Templates/cygwin-package.sh.in
 share/cmake-${CMAKE_API}/completions/cmake
 share/cmake-${CMAKE_API}/completions/cpack
 share/cmake-${CMAKE_API}/completions/ctest
 share/cmake-${CMAKE_API}/editors/emacs/cmake-mode.el
-share/cmake-${CMAKE_API}/editors/vim/cmake-help.vim
-share/cmake-${CMAKE_API}/editors/vim/cmake-indent.vim
-share/cmake-${CMAKE_API}/editors/vim/cmake-syntax.vim
+share/cmake-${CMAKE_API}/editors/vim/indent/cmake.vim
+share/cmake-${CMAKE_API}/editors/vim/syntax/cmake.vim
 share/cmake-${CMAKE_API}/include/cmCPluginAPI.h
 share/doc/cmake-${CMAKE_API}/Copyright.txt
 share/doc/cmake-${CMAKE_API}/cmcompress/Copyright.txt
diff --git a/devel/cmake/distinfo b/devel/cmake/distinfo
index c712230f84d..f5cd7892e61 100644
--- a/devel/cmake/distinfo
+++ b/devel/cmake/distinfo
@@ -1,16 +1,12 @@
-$NetBSD: distinfo,v 1.92 2016/11/04 20:41:09 adam Exp $
+$NetBSD: distinfo,v 1.93 2016/11/12 07:49:18 adam Exp $
 
-SHA1 (cmake-3.6.3.tar.gz) = 4fe15bc983aacca8ae4811f6d8ad8f91b6faa973
-RMD160 (cmake-3.6.3.tar.gz) = 44e853d1661ef27508ce3707057ec4147d7e9031
-SHA512 (cmake-3.6.3.tar.gz) = bfcb51bc01f64a6ae5fb9401c037a529e4b2c0216eef68cf862a7495560dfc80589b34af94450baf4561d217dfb8075b14fbf63e3a668943a65e36ea61c5df48
-Size (cmake-3.6.3.tar.gz) = 6919949 bytes
+SHA1 (cmake-3.7.0.tar.gz) = 53e2437a2644fc02eff34dc4904739e2e26e0556
+RMD160 (cmake-3.7.0.tar.gz) = e0a40516e55a52e1c18d93bdf7cd1d06cf6dc4cd
+SHA512 (cmake-3.7.0.tar.gz) = badeb81ea5b2a765d0ae222d6c7612eba570f46b3645ac8a22e1cf5ea52648239c707e80d51c1d31f8e5b15167e37e6b4d9f6308280560b11feddc3d2fa745cd
+Size (cmake-3.7.0.tar.gz) = 7359368 bytes
 SHA1 (patch-CMakeLists.txt) = a0b03f2fad5ea174095c4fe52cea67d94cf46e2d
 SHA1 (patch-Modules_FindX11.cmake) = 124a2d51155cb4455e8b829dc74598cbd50a4e1c
-SHA1 (patch-Modules_Platform_SCO__SV.cmake) = 3ed230b3a06ea693812db8f57bc73aebec12b99f
 SHA1 (patch-Source_CursesDialog_ccmake.cxx) = e1b6feca837013c715b4268f2ccb134f956f3193
-SHA1 (patch-Source_cmELF.cxx) = f75ddc1b1b3e83169d9a99094bcb6042fabb4da3
-SHA1 (patch-Source_kwsys_SystemInformation.cxx) = 90d171db18f6d0a8aa6c4c57e0f7d3ba02675e29
-SHA1 (patch-Source_kwsys_SystemTools.cxx) = 634348b9bc8ccf8c72f23837baa6ba0bcacf5961
 SHA1 (patch-Utilities_KWIML_CMakeLists.txt) = e4bdf9fc58757e87bf7e3e3e195839eededbc796
 SHA1 (patch-aa) = bab24334e025b7c1bf7caa2e69d6a439cc421ea9
 SHA1 (patch-ab) = d1b39bdcd654f2a4fc63463cd20de656cce3cf8f
diff --git a/devel/cmake/patches/patch-Modules_Platform_SCO__SV.cmake b/devel/cmake/patches/patch-Modules_Platform_SCO__SV.cmake
deleted file mode 100644
index 95269dc4d48..00000000000
--- a/devel/cmake/patches/patch-Modules_Platform_SCO__SV.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-Modules_Platform_SCO__SV.cmake,v 1.1 2014/07/17 13:44:28 ryoon Exp $
-
-* so filename versioning requires CMAKE_SHARED_LIBRARY_SONAME_C_FLAG.
-
---- Modules/Platform/SCO_SV.cmake.orig	2014-01-16 17:15:08.000000000 +0000
-+++ Modules/Platform/SCO_SV.cmake
-@@ -1,2 +1,3 @@
- set(CMAKE_DL_LIBS "")
-+set(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-h,")
- include(Platform/UnixPaths)
diff --git a/devel/cmake/patches/patch-Source_cmELF.cxx b/devel/cmake/patches/patch-Source_cmELF.cxx
deleted file mode 100644
index 68675daa64d..00000000000
--- a/devel/cmake/patches/patch-Source_cmELF.cxx
+++ /dev/null
@@ -1,51 +0,0 @@
-$NetBSD: patch-Source_cmELF.cxx,v 1.4 2016/07/28 17:44:43 prlw1 Exp $
-
-* SCO OpenServer 5.0.7/3.2 has not 64bit ELF support.
-
---- Source/cmELF.cxx.orig	2016-07-07 14:47:27.000000000 +0000
-+++ Source/cmELF.cxx
-@@ -46,6 +46,9 @@ typedef struct Elf32_Rela Elf32_Rela;
- #if defined(__sun)
- #include <sys/link.h> // For dynamic section information
- #endif
-+#if defined(_SCO_DS)
-+# include <link.h> // For DT_SONAME etc.
-+#endif
- 
- // Low-level byte swapping implementation.
- template <size_t s>
-@@ -214,6 +217,8 @@ struct cmELFTypes32
- };
- 
- // Configure the implementation template for 64-bit ELF files.
-+#if !defined(_SCO_DS)
-+// SCO OpenServer 5.0.7/3.2 does not support 64-bit ELF.
- struct cmELFTypes64
- {
-   typedef Elf64_Ehdr ELF_Ehdr;
-@@ -223,6 +228,7 @@ struct cmELFTypes64
-   typedef KWIML_INT_uint64_t tagtype;
-   static const char* GetName() { return "64-bit"; }
- };
-+#endif
- 
- // Parser implementation template.
- template <class Types>
-@@ -799,10 +805,15 @@ cmELF::cmELF(const char* fname)
-   if (ident[EI_CLASS] == ELFCLASS32) {
-     // 32-bit ELF
-     this->Internal = new cmELFInternalImpl<cmELFTypes32>(this, fin, order);
--  } else if (ident[EI_CLASS] == ELFCLASS64) {
-+  }
-+#if !defined(_SCO_DS)
-+// SCO OpenServer 5.0.7/3.2 does not support 64-bit ELF.
-+  else if (ident[EI_CLASS] == ELFCLASS64) {
-     // 64-bit ELF
-     this->Internal = new cmELFInternalImpl<cmELFTypes64>(this, fin, order);
--  } else {
-+  }
-+#endif
-+  else {
-     this->ErrorMessage = "ELF file class is not 32-bit or 64-bit.";
-     return;
-   }
diff --git a/devel/cmake/patches/patch-Source_kwsys_SystemInformation.cxx b/devel/cmake/patches/patch-Source_kwsys_SystemInformation.cxx
deleted file mode 100644
index 8cc82954192..00000000000
--- a/devel/cmake/patches/patch-Source_kwsys_SystemInformation.cxx
+++ /dev/null
@@ -1,50 +0,0 @@
-$NetBSD: patch-Source_kwsys_SystemInformation.cxx,v 1.10 2016/08/03 15:53:38 prlw1 Exp $
-
-* Add more conditional handling for NetBSD, same as others.
-* Treat FreeBSD and DragonFly the same way as NetBSD and OpenBSD.
-* Treat Solaris same as Linux.
-
---- Source/kwsys/SystemInformation.cxx.orig	2015-11-12 15:39:51.000000000 +0000
-+++ Source/kwsys/SystemInformation.cxx
-@@ -80,9 +80,9 @@ typedef int siginfo_t;
- # undef _WIN32
- #endif
- 
--#ifdef __FreeBSD__
-+#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
-+# include <sys/param.h>
- # include <sys/sysctl.h>
--# include <fenv.h>
- # include <sys/socket.h>
- # include <netdb.h>
- # include <netinet/in.h>
-@@ -90,11 +90,15 @@ typedef int siginfo_t;
- #  include <ifaddrs.h>
- #  define KWSYS_SYSTEMINFORMATION_IMPLEMENT_FQDN
- # endif
--#endif
--
--#if defined(__OpenBSD__) || defined(__NetBSD__)
--# include <sys/param.h>
--# include <sys/sysctl.h>
-+# if defined(KWSYS_SYSTEMINFORMATION_HAS_BACKTRACE)
-+#  include <execinfo.h>
-+#  if defined(KWSYS_SYSTEMINFORMATION_HAS_CPP_DEMANGLE)
-+#    include <cxxabi.h>
-+#  endif
-+#  if defined(KWSYS_SYSTEMINFORMATION_HAS_SYMBOL_LOOKUP)
-+#    include <dlfcn.h>
-+#  endif
-+# endif
- #endif
- 
- #if defined(KWSYS_SYS_HAS_MACHINE_CPU_H)
-@@ -124,7 +128,7 @@ typedef int siginfo_t;
- # endif
- #endif
- 
--#ifdef __linux
-+#if defined(__linux) || defined (__sun) || defined(_SCO_DS)
- # include <fenv.h>
- # include <sys/socket.h>
- # include <netdb.h>
diff --git a/devel/cmake/patches/patch-Source_kwsys_SystemTools.cxx b/devel/cmake/patches/patch-Source_kwsys_SystemTools.cxx
deleted file mode 100644
index 040806b896d..00000000000
--- a/devel/cmake/patches/patch-Source_kwsys_SystemTools.cxx
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-Source_kwsys_SystemTools.cxx,v 1.3 2015/01/17 13:29:55 adam Exp $
-
-* SCO OpenServer 5.0.7/3.2's command has 711 permission.
-
---- Source/kwsys/SystemTools.cxx.orig	2014-12-15 20:07:43.000000000 +0000
-+++ Source/kwsys/SystemTools.cxx
-@@ -1120,8 +1120,13 @@ bool SystemTools::FileExists(const kwsys
-             SystemTools::ConvertToWindowsExtendedPath(filename).c_str())
-           != INVALID_FILE_ATTRIBUTES);
- #else
-+// SCO OpenServer 5.0.7/3.2's command has 711 permission.
-+#if defined(_SCO_DS)
-+  return access(filename.c_str(), F_OK) == 0;
-+#else
-   return access(filename.c_str(), R_OK) == 0;
- #endif
-+#endif
- }
- 
- //----------------------------------------------------------------------------