Update CMake to 3.6.1.

https://blog.kitware.com/cmake-3-6-0-available-for-download/
https://blog.kitware.com/cmake-3-6-1-available-for-download/

PR:		210988

9 files changed, 140 insertions, 33 deletions

diff --git a/devel/cmake-doc/Makefile b/devel/cmake-doc/Makefile
index 44028893df0f..600812498f2a 100644
--- a/devel/cmake-doc/Makefile
+++ b/devel/cmake-doc/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	cmake
-PORTVERSION=	3.5.2
+PORTVERSION=	3.6.1
 CATEGORIES=	devel
 MASTER_SITES=	https://www.cmake.org/files/v${PORTVERSION:R}/
 PKGNAMESUFFIX=	-doc
diff --git a/devel/cmake-doc/pkg-plist b/devel/cmake-doc/pkg-plist
index 636267531e56..13b627f5c0e1 100644
--- a/devel/cmake-doc/pkg-plist
+++ b/devel/cmake-doc/pkg-plist
@@ -1,4 +1,12 @@
 %%DOCSDIR%%/CMake-%%CMAKEVERSION%%.qch
+%%DOCSDIR%%/html/_sources/%%CMAKE_BUILD_TYPE%%/3.0.txt
+%%DOCSDIR%%/html/_sources/%%CMAKE_BUILD_TYPE%%/3.1.txt
+%%DOCSDIR%%/html/_sources/%%CMAKE_BUILD_TYPE%%/3.2.txt
+%%DOCSDIR%%/html/_sources/%%CMAKE_BUILD_TYPE%%/3.3.txt
+%%DOCSDIR%%/html/_sources/%%CMAKE_BUILD_TYPE%%/3.4.txt
+%%DOCSDIR%%/html/_sources/%%CMAKE_BUILD_TYPE%%/3.5.txt
+%%DOCSDIR%%/html/_sources/%%CMAKE_BUILD_TYPE%%/3.6.txt
+%%DOCSDIR%%/html/_sources/%%CMAKE_BUILD_TYPE%%/index.txt
 %%DOCSDIR%%/html/_sources/command/add_compile_options.txt
 %%DOCSDIR%%/html/_sources/command/add_custom_command.txt
 %%DOCSDIR%%/html/_sources/command/add_custom_target.txt
@@ -279,6 +287,7 @@
 %%DOCSDIR%%/html/_sources/module/FindKDE4.txt
 %%DOCSDIR%%/html/_sources/module/FindLAPACK.txt
 %%DOCSDIR%%/html/_sources/module/FindLATEX.txt
+%%DOCSDIR%%/html/_sources/module/FindLTTngUST.txt
 %%DOCSDIR%%/html/_sources/module/FindLibArchive.txt
 %%DOCSDIR%%/html/_sources/module/FindLibLZMA.txt
 %%DOCSDIR%%/html/_sources/module/FindLibXml2.txt
@@ -488,6 +497,7 @@
 %%DOCSDIR%%/html/_sources/prop_dir/VARIABLES.txt
 %%DOCSDIR%%/html/_sources/prop_dir/VS_GLOBAL_SECTION_POST_section.txt
 %%DOCSDIR%%/html/_sources/prop_dir/VS_GLOBAL_SECTION_PRE_section.txt
+%%DOCSDIR%%/html/_sources/prop_dir/VS_STARTUP_PROJECT.txt
 %%DOCSDIR%%/html/_sources/prop_gbl/ALLOW_DUPLICATE_CUSTOM_TARGETS.txt
 %%DOCSDIR%%/html/_sources/prop_gbl/AUTOGEN_TARGETS_FOLDER.txt
 %%DOCSDIR%%/html/_sources/prop_gbl/AUTOMOC_TARGETS_FOLDER.txt
@@ -565,6 +575,7 @@
 %%DOCSDIR%%/html/_sources/prop_test/RUN_SERIAL.txt
 %%DOCSDIR%%/html/_sources/prop_test/SKIP_RETURN_CODE.txt
 %%DOCSDIR%%/html/_sources/prop_test/TIMEOUT.txt
+%%DOCSDIR%%/html/_sources/prop_test/TIMEOUT_AFTER_MATCH.txt
 %%DOCSDIR%%/html/_sources/prop_test/WILL_FAIL.txt
 %%DOCSDIR%%/html/_sources/prop_test/WORKING_DIRECTORY.txt
 %%DOCSDIR%%/html/_sources/prop_tgt/ALIASED_TARGET.txt
@@ -624,6 +635,7 @@
 %%DOCSDIR%%/html/_sources/prop_tgt/C_STANDARD_REQUIRED.txt
 %%DOCSDIR%%/html/_sources/prop_tgt/DEBUG_POSTFIX.txt
 %%DOCSDIR%%/html/_sources/prop_tgt/DEFINE_SYMBOL.txt
+%%DOCSDIR%%/html/_sources/prop_tgt/DEPLOYMENT_REMOTE_DIRECTORY.txt
 %%DOCSDIR%%/html/_sources/prop_tgt/ENABLE_EXPORTS.txt
 %%DOCSDIR%%/html/_sources/prop_tgt/EXCLUDE_FROM_ALL.txt
 %%DOCSDIR%%/html/_sources/prop_tgt/EXCLUDE_FROM_DEFAULT_BUILD.txt
@@ -678,6 +690,7 @@
 %%DOCSDIR%%/html/_sources/prop_tgt/JOB_POOL_COMPILE.txt
 %%DOCSDIR%%/html/_sources/prop_tgt/JOB_POOL_LINK.txt
 %%DOCSDIR%%/html/_sources/prop_tgt/LABELS.txt
+%%DOCSDIR%%/html/_sources/prop_tgt/LANG_CLANG_TIDY.txt
 %%DOCSDIR%%/html/_sources/prop_tgt/LANG_COMPILER_LAUNCHER.txt
 %%DOCSDIR%%/html/_sources/prop_tgt/LANG_INCLUDE_WHAT_YOU_USE.txt
 %%DOCSDIR%%/html/_sources/prop_tgt/LANG_VISIBILITY_PRESET.txt
@@ -740,6 +753,7 @@
 %%DOCSDIR%%/html/_sources/prop_tgt/TYPE.txt
 %%DOCSDIR%%/html/_sources/prop_tgt/VERSION.txt
 %%DOCSDIR%%/html/_sources/prop_tgt/VISIBILITY_INLINES_HIDDEN.txt
+%%DOCSDIR%%/html/_sources/prop_tgt/VS_CONFIGURATION_TYPE.txt
 %%DOCSDIR%%/html/_sources/prop_tgt/VS_DESKTOP_EXTENSIONS_VERSION.txt
 %%DOCSDIR%%/html/_sources/prop_tgt/VS_DOTNET_REFERENCES.txt
 %%DOCSDIR%%/html/_sources/prop_tgt/VS_DOTNET_TARGET_FRAMEWORK_VERSION.txt
@@ -763,13 +777,6 @@
 %%DOCSDIR%%/html/_sources/prop_tgt/WINDOWS_EXPORT_ALL_SYMBOLS.txt
 %%DOCSDIR%%/html/_sources/prop_tgt/XCODE_ATTRIBUTE_an-attribute.txt
 %%DOCSDIR%%/html/_sources/prop_tgt/XCTEST.txt
-%%DOCSDIR%%/html/_sources/%%CMAKE_BUILD_TYPE%%/3.0.txt
-%%DOCSDIR%%/html/_sources/%%CMAKE_BUILD_TYPE%%/3.1.txt
-%%DOCSDIR%%/html/_sources/%%CMAKE_BUILD_TYPE%%/3.2.txt
-%%DOCSDIR%%/html/_sources/%%CMAKE_BUILD_TYPE%%/3.3.txt
-%%DOCSDIR%%/html/_sources/%%CMAKE_BUILD_TYPE%%/3.4.txt
-%%DOCSDIR%%/html/_sources/%%CMAKE_BUILD_TYPE%%/3.5.txt
-%%DOCSDIR%%/html/_sources/%%CMAKE_BUILD_TYPE%%/index.txt
 %%DOCSDIR%%/html/_sources/variable/APPLE.txt
 %%DOCSDIR%%/html/_sources/variable/BORLAND.txt
 %%DOCSDIR%%/html/_sources/variable/BUILD_SHARED_LIBS.txt
@@ -841,8 +848,13 @@
 %%DOCSDIR%%/html/_sources/variable/CMAKE_C_STANDARD_REQUIRED.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_DEBUG_POSTFIX.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_DEBUG_TARGET_PROPERTIES.txt
+%%DOCSDIR%%/html/_sources/variable/CMAKE_DEPENDS_IN_PROJECT_ONLY.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_DISABLE_FIND_PACKAGE_PackageName.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_DL_LIBS.txt
+%%DOCSDIR%%/html/_sources/variable/CMAKE_ECLIPSE_GENERATE_LINKED_RESOURCES.txt
+%%DOCSDIR%%/html/_sources/variable/CMAKE_ECLIPSE_GENERATE_SOURCE_PROJECT.txt
+%%DOCSDIR%%/html/_sources/variable/CMAKE_ECLIPSE_MAKE_ARGUMENTS.txt
+%%DOCSDIR%%/html/_sources/variable/CMAKE_ECLIPSE_VERSION.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_EDIT_COMMAND.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_ENABLE_EXPORTS.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_ERROR_DEPRECATED.txt
@@ -880,6 +892,7 @@
 %%DOCSDIR%%/html/_sources/variable/CMAKE_GNUtoMS.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_HOME_DIRECTORY.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_HOST_APPLE.txt
+%%DOCSDIR%%/html/_sources/variable/CMAKE_HOST_SOLARIS.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_HOST_SYSTEM.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_HOST_SYSTEM_NAME.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_HOST_SYSTEM_PROCESSOR.txt
@@ -907,6 +920,7 @@
 %%DOCSDIR%%/html/_sources/variable/CMAKE_LANG_ARCHIVE_APPEND.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_LANG_ARCHIVE_CREATE.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_LANG_ARCHIVE_FINISH.txt
+%%DOCSDIR%%/html/_sources/variable/CMAKE_LANG_CLANG_TIDY.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_LANG_COMPILER.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_LANG_COMPILER_ABI.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_LANG_COMPILER_EXTERNAL_TOOLCHAIN.txt
@@ -944,6 +958,8 @@
 %%DOCSDIR%%/html/_sources/variable/CMAKE_LANG_SIMULATE_VERSION.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_LANG_SIZEOF_DATA_PTR.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_LANG_SOURCE_FILE_EXTENSIONS.txt
+%%DOCSDIR%%/html/_sources/variable/CMAKE_LANG_STANDARD_INCLUDE_DIRECTORIES.txt
+%%DOCSDIR%%/html/_sources/variable/CMAKE_LANG_STANDARD_LIBRARIES.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_LANG_VISIBILITY_PRESET.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_LIBRARY_ARCHITECTURE.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_LIBRARY_ARCHITECTURE_REGEX.txt
@@ -971,6 +987,7 @@
 %%DOCSDIR%%/html/_sources/variable/CMAKE_MODULE_LINKER_FLAGS.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_MODULE_LINKER_FLAGS_CONFIG.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_MODULE_PATH.txt
+%%DOCSDIR%%/html/_sources/variable/CMAKE_NINJA_OUTPUT_PATH_PREFIX.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_NOT_USING_CONFIG_FLAGS.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_NO_BUILTIN_CHRPATH.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_NO_SYSTEM_FROM_IMPORTED.txt
@@ -1008,7 +1025,6 @@
 %%DOCSDIR%%/html/_sources/variable/CMAKE_SKIP_RPATH.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_SOURCE_DIR.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_STAGING_PREFIX.txt
-%%DOCSDIR%%/html/_sources/variable/CMAKE_STANDARD_LIBRARIES.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_STATIC_LIBRARY_PREFIX.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_STATIC_LIBRARY_SUFFIX.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_STATIC_LINKER_FLAGS.txt
@@ -1027,6 +1043,8 @@
 %%DOCSDIR%%/html/_sources/variable/CMAKE_SYSTEM_VERSION.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_TOOLCHAIN_FILE.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_TRY_COMPILE_CONFIGURATION.txt
+%%DOCSDIR%%/html/_sources/variable/CMAKE_TRY_COMPILE_PLATFORM_VARIABLES.txt
+%%DOCSDIR%%/html/_sources/variable/CMAKE_TRY_COMPILE_TARGET_TYPE.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_TWEAK_VERSION.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_USER_MAKE_RULES_OVERRIDE.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_USER_MAKE_RULES_OVERRIDE_LANG.txt
@@ -1038,7 +1056,6 @@
 %%DOCSDIR%%/html/_sources/variable/CMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_VS_INTEL_Fortran_PROJECT_VERSION.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_VS_MSBUILD_COMMAND.txt
-%%DOCSDIR%%/html/_sources/variable/CMAKE_VS_MSDEV_COMMAND.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_VS_NsightTegra_VERSION.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_VS_PLATFORM_NAME.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_VS_PLATFORM_TOOLSET.txt
@@ -1097,6 +1114,7 @@
 %%DOCSDIR%%/html/_sources/variable/CTEST_DROP_SITE_USER.txt
 %%DOCSDIR%%/html/_sources/variable/CTEST_EXTRA_COVERAGE_GLOB.txt
 %%DOCSDIR%%/html/_sources/variable/CTEST_GIT_COMMAND.txt
+%%DOCSDIR%%/html/_sources/variable/CTEST_GIT_INIT_SUBMODULES.txt
 %%DOCSDIR%%/html/_sources/variable/CTEST_GIT_UPDATE_CUSTOM.txt
 %%DOCSDIR%%/html/_sources/variable/CTEST_GIT_UPDATE_OPTIONS.txt
 %%DOCSDIR%%/html/_sources/variable/CTEST_HG_COMMAND.txt
@@ -1470,6 +1488,7 @@
 %%DOCSDIR%%/html/module/FindKDE4.html
 %%DOCSDIR%%/html/module/FindLAPACK.html
 %%DOCSDIR%%/html/module/FindLATEX.html
+%%DOCSDIR%%/html/module/FindLTTngUST.html
 %%DOCSDIR%%/html/module/FindLibArchive.html
 %%DOCSDIR%%/html/module/FindLibLZMA.html
 %%DOCSDIR%%/html/module/FindLibXml2.html
@@ -1680,6 +1699,7 @@
 %%DOCSDIR%%/html/prop_dir/VARIABLES.html
 %%DOCSDIR%%/html/prop_dir/VS_GLOBAL_SECTION_POST_section.html
 %%DOCSDIR%%/html/prop_dir/VS_GLOBAL_SECTION_PRE_section.html
+%%DOCSDIR%%/html/prop_dir/VS_STARTUP_PROJECT.html
 %%DOCSDIR%%/html/prop_gbl/ALLOW_DUPLICATE_CUSTOM_TARGETS.html
 %%DOCSDIR%%/html/prop_gbl/AUTOGEN_TARGETS_FOLDER.html
 %%DOCSDIR%%/html/prop_gbl/AUTOMOC_TARGETS_FOLDER.html
@@ -1757,6 +1777,7 @@
 %%DOCSDIR%%/html/prop_test/RUN_SERIAL.html
 %%DOCSDIR%%/html/prop_test/SKIP_RETURN_CODE.html
 %%DOCSDIR%%/html/prop_test/TIMEOUT.html
+%%DOCSDIR%%/html/prop_test/TIMEOUT_AFTER_MATCH.html
 %%DOCSDIR%%/html/prop_test/WILL_FAIL.html
 %%DOCSDIR%%/html/prop_test/WORKING_DIRECTORY.html
 %%DOCSDIR%%/html/prop_tgt/ALIASED_TARGET.html
@@ -1816,6 +1837,7 @@
 %%DOCSDIR%%/html/prop_tgt/C_STANDARD_REQUIRED.html
 %%DOCSDIR%%/html/prop_tgt/DEBUG_POSTFIX.html
 %%DOCSDIR%%/html/prop_tgt/DEFINE_SYMBOL.html
+%%DOCSDIR%%/html/prop_tgt/DEPLOYMENT_REMOTE_DIRECTORY.html
 %%DOCSDIR%%/html/prop_tgt/ENABLE_EXPORTS.html
 %%DOCSDIR%%/html/prop_tgt/EXCLUDE_FROM_ALL.html
 %%DOCSDIR%%/html/prop_tgt/EXCLUDE_FROM_DEFAULT_BUILD.html
@@ -1870,6 +1892,7 @@
 %%DOCSDIR%%/html/prop_tgt/JOB_POOL_COMPILE.html
 %%DOCSDIR%%/html/prop_tgt/JOB_POOL_LINK.html
 %%DOCSDIR%%/html/prop_tgt/LABELS.html
+%%DOCSDIR%%/html/prop_tgt/LANG_CLANG_TIDY.html
 %%DOCSDIR%%/html/prop_tgt/LANG_COMPILER_LAUNCHER.html
 %%DOCSDIR%%/html/prop_tgt/LANG_INCLUDE_WHAT_YOU_USE.html
 %%DOCSDIR%%/html/prop_tgt/LANG_VISIBILITY_PRESET.html
@@ -1932,6 +1955,7 @@
 %%DOCSDIR%%/html/prop_tgt/TYPE.html
 %%DOCSDIR%%/html/prop_tgt/VERSION.html
 %%DOCSDIR%%/html/prop_tgt/VISIBILITY_INLINES_HIDDEN.html
+%%DOCSDIR%%/html/prop_tgt/VS_CONFIGURATION_TYPE.html
 %%DOCSDIR%%/html/prop_tgt/VS_DESKTOP_EXTENSIONS_VERSION.html
 %%DOCSDIR%%/html/prop_tgt/VS_DOTNET_REFERENCES.html
 %%DOCSDIR%%/html/prop_tgt/VS_DOTNET_TARGET_FRAMEWORK_VERSION.html
@@ -1961,6 +1985,7 @@
 %%DOCSDIR%%/html/%%CMAKE_BUILD_TYPE%%/3.3.html
 %%DOCSDIR%%/html/%%CMAKE_BUILD_TYPE%%/3.4.html
 %%DOCSDIR%%/html/%%CMAKE_BUILD_TYPE%%/3.5.html
+%%DOCSDIR%%/html/%%CMAKE_BUILD_TYPE%%/3.6.html
 %%DOCSDIR%%/html/%%CMAKE_BUILD_TYPE%%/index.html
 %%DOCSDIR%%/html/search.html
 %%DOCSDIR%%/html/searchindex.js
@@ -2035,8 +2060,13 @@
 %%DOCSDIR%%/html/variable/CMAKE_C_STANDARD_REQUIRED.html
 %%DOCSDIR%%/html/variable/CMAKE_DEBUG_POSTFIX.html
 %%DOCSDIR%%/html/variable/CMAKE_DEBUG_TARGET_PROPERTIES.html
+%%DOCSDIR%%/html/variable/CMAKE_DEPENDS_IN_PROJECT_ONLY.html
 %%DOCSDIR%%/html/variable/CMAKE_DISABLE_FIND_PACKAGE_PackageName.html
 %%DOCSDIR%%/html/variable/CMAKE_DL_LIBS.html
+%%DOCSDIR%%/html/variable/CMAKE_ECLIPSE_GENERATE_LINKED_RESOURCES.html
+%%DOCSDIR%%/html/variable/CMAKE_ECLIPSE_GENERATE_SOURCE_PROJECT.html
+%%DOCSDIR%%/html/variable/CMAKE_ECLIPSE_MAKE_ARGUMENTS.html
+%%DOCSDIR%%/html/variable/CMAKE_ECLIPSE_VERSION.html
 %%DOCSDIR%%/html/variable/CMAKE_EDIT_COMMAND.html
 %%DOCSDIR%%/html/variable/CMAKE_ENABLE_EXPORTS.html
 %%DOCSDIR%%/html/variable/CMAKE_ERROR_DEPRECATED.html
@@ -2074,6 +2104,7 @@
 %%DOCSDIR%%/html/variable/CMAKE_GNUtoMS.html
 %%DOCSDIR%%/html/variable/CMAKE_HOME_DIRECTORY.html
 %%DOCSDIR%%/html/variable/CMAKE_HOST_APPLE.html
+%%DOCSDIR%%/html/variable/CMAKE_HOST_SOLARIS.html
 %%DOCSDIR%%/html/variable/CMAKE_HOST_SYSTEM.html
 %%DOCSDIR%%/html/variable/CMAKE_HOST_SYSTEM_NAME.html
 %%DOCSDIR%%/html/variable/CMAKE_HOST_SYSTEM_PROCESSOR.html
@@ -2101,6 +2132,7 @@
 %%DOCSDIR%%/html/variable/CMAKE_LANG_ARCHIVE_APPEND.html
 %%DOCSDIR%%/html/variable/CMAKE_LANG_ARCHIVE_CREATE.html
 %%DOCSDIR%%/html/variable/CMAKE_LANG_ARCHIVE_FINISH.html
+%%DOCSDIR%%/html/variable/CMAKE_LANG_CLANG_TIDY.html
 %%DOCSDIR%%/html/variable/CMAKE_LANG_COMPILER.html
 %%DOCSDIR%%/html/variable/CMAKE_LANG_COMPILER_ABI.html
 %%DOCSDIR%%/html/variable/CMAKE_LANG_COMPILER_EXTERNAL_TOOLCHAIN.html
@@ -2138,6 +2170,8 @@
 %%DOCSDIR%%/html/variable/CMAKE_LANG_SIMULATE_VERSION.html
 %%DOCSDIR%%/html/variable/CMAKE_LANG_SIZEOF_DATA_PTR.html
 %%DOCSDIR%%/html/variable/CMAKE_LANG_SOURCE_FILE_EXTENSIONS.html
+%%DOCSDIR%%/html/variable/CMAKE_LANG_STANDARD_INCLUDE_DIRECTORIES.html
+%%DOCSDIR%%/html/variable/CMAKE_LANG_STANDARD_LIBRARIES.html
 %%DOCSDIR%%/html/variable/CMAKE_LANG_VISIBILITY_PRESET.html
 %%DOCSDIR%%/html/variable/CMAKE_LIBRARY_ARCHITECTURE.html
 %%DOCSDIR%%/html/variable/CMAKE_LIBRARY_ARCHITECTURE_REGEX.html
@@ -2165,6 +2199,7 @@
 %%DOCSDIR%%/html/variable/CMAKE_MODULE_LINKER_FLAGS.html
 %%DOCSDIR%%/html/variable/CMAKE_MODULE_LINKER_FLAGS_CONFIG.html
 %%DOCSDIR%%/html/variable/CMAKE_MODULE_PATH.html
+%%DOCSDIR%%/html/variable/CMAKE_NINJA_OUTPUT_PATH_PREFIX.html
 %%DOCSDIR%%/html/variable/CMAKE_NOT_USING_CONFIG_FLAGS.html
 %%DOCSDIR%%/html/variable/CMAKE_NO_BUILTIN_CHRPATH.html
 %%DOCSDIR%%/html/variable/CMAKE_NO_SYSTEM_FROM_IMPORTED.html
@@ -2202,7 +2237,6 @@
 %%DOCSDIR%%/html/variable/CMAKE_SKIP_RPATH.html
 %%DOCSDIR%%/html/variable/CMAKE_SOURCE_DIR.html
 %%DOCSDIR%%/html/variable/CMAKE_STAGING_PREFIX.html
-%%DOCSDIR%%/html/variable/CMAKE_STANDARD_LIBRARIES.html
 %%DOCSDIR%%/html/variable/CMAKE_STATIC_LIBRARY_PREFIX.html
 %%DOCSDIR%%/html/variable/CMAKE_STATIC_LIBRARY_SUFFIX.html
 %%DOCSDIR%%/html/variable/CMAKE_STATIC_LINKER_FLAGS.html
@@ -2221,6 +2255,8 @@
 %%DOCSDIR%%/html/variable/CMAKE_SYSTEM_VERSION.html
 %%DOCSDIR%%/html/variable/CMAKE_TOOLCHAIN_FILE.html
 %%DOCSDIR%%/html/variable/CMAKE_TRY_COMPILE_CONFIGURATION.html
+%%DOCSDIR%%/html/variable/CMAKE_TRY_COMPILE_PLATFORM_VARIABLES.html
+%%DOCSDIR%%/html/variable/CMAKE_TRY_COMPILE_TARGET_TYPE.html
 %%DOCSDIR%%/html/variable/CMAKE_TWEAK_VERSION.html
 %%DOCSDIR%%/html/variable/CMAKE_USER_MAKE_RULES_OVERRIDE.html
 %%DOCSDIR%%/html/variable/CMAKE_USER_MAKE_RULES_OVERRIDE_LANG.html
@@ -2232,7 +2268,6 @@
 %%DOCSDIR%%/html/variable/CMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD.html
 %%DOCSDIR%%/html/variable/CMAKE_VS_INTEL_Fortran_PROJECT_VERSION.html
 %%DOCSDIR%%/html/variable/CMAKE_VS_MSBUILD_COMMAND.html
-%%DOCSDIR%%/html/variable/CMAKE_VS_MSDEV_COMMAND.html
 %%DOCSDIR%%/html/variable/CMAKE_VS_NsightTegra_VERSION.html
 %%DOCSDIR%%/html/variable/CMAKE_VS_PLATFORM_NAME.html
 %%DOCSDIR%%/html/variable/CMAKE_VS_PLATFORM_TOOLSET.html
@@ -2291,6 +2326,7 @@
 %%DOCSDIR%%/html/variable/CTEST_DROP_SITE_USER.html
 %%DOCSDIR%%/html/variable/CTEST_EXTRA_COVERAGE_GLOB.html
 %%DOCSDIR%%/html/variable/CTEST_GIT_COMMAND.html
+%%DOCSDIR%%/html/variable/CTEST_GIT_INIT_SUBMODULES.html
 %%DOCSDIR%%/html/variable/CTEST_GIT_UPDATE_CUSTOM.html
 %%DOCSDIR%%/html/variable/CTEST_GIT_UPDATE_OPTIONS.html
 %%DOCSDIR%%/html/variable/CTEST_HG_COMMAND.html
diff --git a/devel/cmake-gui/Makefile b/devel/cmake-gui/Makefile
index 0a53b45f5d14..f8d76fb91b70 100644
--- a/devel/cmake-gui/Makefile
+++ b/devel/cmake-gui/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	cmake
-PORTVERSION=	3.5.2
-PORTREVISION=	1
+PORTVERSION=	3.6.1
 CATEGORIES=	devel
 MASTER_SITES=	https://www.cmake.org/files/v${PORTVERSION:R}/
 PKGNAMESUFFIX=	-gui
diff --git a/devel/cmake-gui/files/patch-git_5ec17e61 b/devel/cmake-gui/files/patch-git_5ec17e61
new file mode 100644
index 000000000000..6347997356f5
--- /dev/null
+++ b/devel/cmake-gui/files/patch-git_5ec17e61
@@ -0,0 +1,26 @@
+While not strictly necessary because of patch-git_86dd2427, this patch helps
+CMake determine the maximum size of the command line and determine whether
+ninja generator needs to use .rsp files.
+
+commit 5ec17e610609b8ca80cf8ce4f33f8c03ea48a090
+Author: Raphael Kubo da Costa <rakuco@FreeBSD.org>
+Date:   Fri Jul 15 12:46:53 2016 +0200
+
+    Ninja: Generalize check for sysconf(3) call
+
+    Use `sysconf(_SC_ARG_MAX)` wherever `_SC_ARG_MAX` is available instead
+    of hard-coding an incomplete list of operating systems that implement
+    it.  In particular, it is available on BSD platforms that were not
+    previously listed.
+
+--- Source/cmNinjaNormalTargetGenerator.cxx
++++ Source/cmNinjaNormalTargetGenerator.cxx
+@@ -374,7 +374,7 @@ static int calculateCommandLineLengthLimit(int linkRuleLength)
+ #ifdef _WIN32
+     8000,
+ #endif
+-#if defined(__APPLE__) || defined(__HAIKU__) || defined(__linux)
++#if defined(_SC_ARG_MAX)
+     // for instance ARG_MAX is 2096152 on Ubuntu or 262144 on Mac
+     ((int)sysconf(_SC_ARG_MAX)) - 1000,
+ #endif
diff --git a/devel/cmake-modules/pkg-plist b/devel/cmake-modules/pkg-plist
index 52c3b6b2803f..adc82d37568e 100644
--- a/devel/cmake-modules/pkg-plist
+++ b/devel/cmake-modules/pkg-plist
@@ -105,9 +105,7 @@
 %%DATADIR%%/Modules/CMakeTestJavaCompiler.cmake
 %%DATADIR%%/Modules/CMakeTestRCCompiler.cmake
 %%DATADIR%%/Modules/CMakeTestSwiftCompiler.cmake
-%%DATADIR%%/Modules/CMakeTestWatcomVersion.c
 %%DATADIR%%/Modules/CMakeUnixFindMake.cmake
-%%DATADIR%%/Modules/CMakeVS6BackwardCompatibility.cmake
 %%DATADIR%%/Modules/CMakeVS7BackwardCompatibility.cmake
 %%DATADIR%%/Modules/CMakeVerifyManifest.cmake
 %%DATADIR%%/Modules/CPack.DS_Store.in
@@ -184,6 +182,8 @@
 %%DATADIR%%/Modules/Compiler/AppleClang-CXX.cmake
 %%DATADIR%%/Modules/Compiler/AppleClang-DetermineCompiler.cmake
 %%DATADIR%%/Modules/Compiler/Borland-DetermineCompiler.cmake
+%%DATADIR%%/Modules/Compiler/Bruce-C-DetermineCompiler.cmake
+%%DATADIR%%/Modules/Compiler/Bruce-C.cmake
 %%DATADIR%%/Modules/Compiler/CCur-Fortran.cmake
 %%DATADIR%%/Modules/Compiler/Clang-ASM.cmake
 %%DATADIR%%/Modules/Compiler/Clang-C-FeatureTests.cmake
@@ -223,6 +223,7 @@
 %%DATADIR%%/Modules/Compiler/GHS-C.cmake
 %%DATADIR%%/Modules/Compiler/GHS-CXX.cmake
 %%DATADIR%%/Modules/Compiler/GHS-DetermineCompiler.cmake
+%%DATADIR%%/Modules/Compiler/GHS.cmake
 %%DATADIR%%/Modules/Compiler/GNU-ASM.cmake
 %%DATADIR%%/Modules/Compiler/GNU-C-FeatureTests.cmake
 %%DATADIR%%/Modules/Compiler/GNU-C.cmake
@@ -245,7 +246,9 @@
 %%DATADIR%%/Modules/Compiler/IBMCPP-C-DetermineVersionInternal.cmake
 %%DATADIR%%/Modules/Compiler/IBMCPP-CXX-DetermineVersionInternal.cmake
 %%DATADIR%%/Modules/Compiler/Intel-ASM.cmake
+%%DATADIR%%/Modules/Compiler/Intel-C-FeatureTests.cmake
 %%DATADIR%%/Modules/Compiler/Intel-C.cmake
+%%DATADIR%%/Modules/Compiler/Intel-CXX-FeatureTests.cmake
 %%DATADIR%%/Modules/Compiler/Intel-CXX.cmake
 %%DATADIR%%/Modules/Compiler/Intel-DetermineCompiler.cmake
 %%DATADIR%%/Modules/Compiler/Intel-Fortran.cmake
@@ -305,7 +308,6 @@
 %%DATADIR%%/Modules/Compiler/zOS-C-DetermineCompiler.cmake
 %%DATADIR%%/Modules/Compiler/zOS-CXX-DetermineCompiler.cmake
 %%DATADIR%%/Modules/CompilerId/VS-10.vcxproj.in
-%%DATADIR%%/Modules/CompilerId/VS-6.dsp.in
 %%DATADIR%%/Modules/CompilerId/VS-7.vcproj.in
 %%DATADIR%%/Modules/CompilerId/VS-Intel.vfproj.in
 %%DATADIR%%/Modules/CompilerId/VS-NsightTegra.vcxproj.in
@@ -320,6 +322,8 @@
 %%DATADIR%%/Modules/DummyCXXFile.cxx
 %%DATADIR%%/Modules/ExternalData.cmake
 %%DATADIR%%/Modules/ExternalData_config.cmake.in
+%%DATADIR%%/Modules/ExternalProject-download.cmake.in
+%%DATADIR%%/Modules/ExternalProject-verify.cmake.in
 %%DATADIR%%/Modules/ExternalProject.cmake
 %%DATADIR%%/Modules/FLTKCompatibility.cmake
 %%DATADIR%%/Modules/FeatureSummary.cmake
@@ -384,6 +388,7 @@
 %%DATADIR%%/Modules/FindKDE4.cmake
 %%DATADIR%%/Modules/FindLAPACK.cmake
 %%DATADIR%%/Modules/FindLATEX.cmake
+%%DATADIR%%/Modules/FindLTTngUST.cmake
 %%DATADIR%%/Modules/FindLibArchive.cmake
 %%DATADIR%%/Modules/FindLibLZMA.cmake
 %%DATADIR%%/Modules/FindLibXml2.cmake
@@ -558,6 +563,8 @@
 %%DATADIR%%/Modules/Platform/BlueGeneQ-static-XL-Fortran.cmake
 %%DATADIR%%/Modules/Platform/BlueGeneQ-static.cmake
 %%DATADIR%%/Modules/Platform/CYGWIN-CXX.cmake
+%%DATADIR%%/Modules/Platform/CYGWIN-Clang-C.cmake
+%%DATADIR%%/Modules/Platform/CYGWIN-Clang-CXX.cmake
 %%DATADIR%%/Modules/Platform/CYGWIN-GNU-C.cmake
 %%DATADIR%%/Modules/Platform/CYGWIN-GNU-CXX.cmake
 %%DATADIR%%/Modules/Platform/CYGWIN-GNU-Fortran.cmake
@@ -662,6 +669,10 @@
 %%DATADIR%%/Modules/Platform/SunOS-GNU-CXX.cmake
 %%DATADIR%%/Modules/Platform/SunOS-GNU-Fortran.cmake
 %%DATADIR%%/Modules/Platform/SunOS-GNU.cmake
+%%DATADIR%%/Modules/Platform/SunOS-PathScale-C.cmake
+%%DATADIR%%/Modules/Platform/SunOS-PathScale-CXX.cmake
+%%DATADIR%%/Modules/Platform/SunOS-PathScale-Fortran.cmake
+%%DATADIR%%/Modules/Platform/SunOS-PathScale.cmake
 %%DATADIR%%/Modules/Platform/SunOS.cmake
 %%DATADIR%%/Modules/Platform/Tru64.cmake
 %%DATADIR%%/Modules/Platform/ULTRIX.cmake
@@ -757,20 +768,12 @@
 %%DATADIR%%/Templates/AppleInfo.plist
 %%DATADIR%%/Templates/CMakeVSMacros1.vsmacros
 %%DATADIR%%/Templates/CMakeVSMacros2.vsmacros
-%%DATADIR%%/Templates/CMakeVisualStudio6Configurations.cmake
 %%DATADIR%%/Templates/CPack.GenericDescription.txt
 %%DATADIR%%/Templates/CPack.GenericLicense.txt
 %%DATADIR%%/Templates/CPack.GenericWelcome.txt
 %%DATADIR%%/Templates/CPackConfig.cmake.in
 %%DATADIR%%/Templates/CTestScript.cmake.in
-%%DATADIR%%/Templates/DLLFooter.dsptemplate
-%%DATADIR%%/Templates/DLLHeader.dsptemplate
-%%DATADIR%%/Templates/EXEFooter.dsptemplate
-%%DATADIR%%/Templates/EXEHeader.dsptemplate
-%%DATADIR%%/Templates/EXEWinHeader.dsptemplate
 %%DATADIR%%/Templates/TestDriver.cxx.in
-%%DATADIR%%/Templates/UtilityFooter.dsptemplate
-%%DATADIR%%/Templates/UtilityHeader.dsptemplate
 %%DATADIR%%/Templates/Windows/ApplicationIcon.png
 %%DATADIR%%/Templates/Windows/Logo.png
 %%DATADIR%%/Templates/Windows/SmallLogo.png
@@ -779,5 +782,3 @@
 %%DATADIR%%/Templates/Windows/StoreLogo.png
 %%DATADIR%%/Templates/Windows/Windows_TemporaryKey.pfx
 %%DATADIR%%/Templates/cygwin-package.sh.in
-%%DATADIR%%/Templates/staticLibFooter.dsptemplate
-%%DATADIR%%/Templates/staticLibHeader.dsptemplate
diff --git a/devel/cmake/Makefile b/devel/cmake/Makefile
index b56c475f9a72..6e79f243fde1 100644
--- a/devel/cmake/Makefile
+++ b/devel/cmake/Makefile
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	cmake
-PORTVERSION=	3.5.2
-PORTREVISION?=	2
+PORTVERSION=	3.6.1
+PORTREVISION?=	0
 CATEGORIES=	devel
 MASTER_SITES=	https://www.cmake.org/files/v${PORTVERSION:R}/
 
diff --git a/devel/cmake/distinfo b/devel/cmake/distinfo
index 6f8895439e09..14bf07384a5c 100644
--- a/devel/cmake/distinfo
+++ b/devel/cmake/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cmake-3.5.2.tar.gz) = 92d8410d3d981bb881dfff2aed466da55a58d34c7390d50449aa59b32bb5e62a
-SIZE (cmake-3.5.2.tar.gz) = 6863498
+TIMESTAMP = 1469262555
+SHA256 (cmake-3.6.1.tar.gz) = 28ee98ec40427d41a45673847db7a905b59ce9243bb866eaf59dce0f58aaef11
+SIZE (cmake-3.6.1.tar.gz) = 6895262
diff --git a/devel/cmake/files/patch-git_5ec17e61 b/devel/cmake/files/patch-git_5ec17e61
new file mode 100644
index 000000000000..6347997356f5
--- /dev/null
+++ b/devel/cmake/files/patch-git_5ec17e61
@@ -0,0 +1,26 @@
+While not strictly necessary because of patch-git_86dd2427, this patch helps
+CMake determine the maximum size of the command line and determine whether
+ninja generator needs to use .rsp files.
+
+commit 5ec17e610609b8ca80cf8ce4f33f8c03ea48a090
+Author: Raphael Kubo da Costa <rakuco@FreeBSD.org>
+Date:   Fri Jul 15 12:46:53 2016 +0200
+
+    Ninja: Generalize check for sysconf(3) call
+
+    Use `sysconf(_SC_ARG_MAX)` wherever `_SC_ARG_MAX` is available instead
+    of hard-coding an incomplete list of operating systems that implement
+    it.  In particular, it is available on BSD platforms that were not
+    previously listed.
+
+--- Source/cmNinjaNormalTargetGenerator.cxx
++++ Source/cmNinjaNormalTargetGenerator.cxx
+@@ -374,7 +374,7 @@ static int calculateCommandLineLengthLimit(int linkRuleLength)
+ #ifdef _WIN32
+     8000,
+ #endif
+-#if defined(__APPLE__) || defined(__HAIKU__) || defined(__linux)
++#if defined(_SC_ARG_MAX)
+     // for instance ARG_MAX is 2096152 on Ubuntu or 262144 on Mac
+     ((int)sysconf(_SC_ARG_MAX)) - 1000,
+ #endif
diff --git a/devel/cmake/pkg-plist b/devel/cmake/pkg-plist
index ea63776dd633..4c9d9b27d1d2 100644
--- a/devel/cmake/pkg-plist
+++ b/devel/cmake/pkg-plist
@@ -309,6 +309,7 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/module/FindKDE4.rst
 %%DATADIR%%/Help/module/FindLAPACK.rst
 %%DATADIR%%/Help/module/FindLATEX.rst
+%%DATADIR%%/Help/module/FindLTTngUST.rst
 %%DATADIR%%/Help/module/FindLibArchive.rst
 %%DATADIR%%/Help/module/FindLibLZMA.rst
 %%DATADIR%%/Help/module/FindLibXml2.rst
@@ -520,6 +521,7 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/prop_dir/VARIABLES.rst
 %%DATADIR%%/Help/prop_dir/VS_GLOBAL_SECTION_POST_section.rst
 %%DATADIR%%/Help/prop_dir/VS_GLOBAL_SECTION_PRE_section.rst
+%%DATADIR%%/Help/prop_dir/VS_STARTUP_PROJECT.rst
 %%DATADIR%%/Help/prop_gbl/ALLOW_DUPLICATE_CUSTOM_TARGETS.rst
 %%DATADIR%%/Help/prop_gbl/AUTOGEN_TARGETS_FOLDER.rst
 %%DATADIR%%/Help/prop_gbl/AUTOMOC_TARGETS_FOLDER.rst
@@ -597,6 +599,7 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/prop_test/RUN_SERIAL.rst
 %%DATADIR%%/Help/prop_test/SKIP_RETURN_CODE.rst
 %%DATADIR%%/Help/prop_test/TIMEOUT.rst
+%%DATADIR%%/Help/prop_test/TIMEOUT_AFTER_MATCH.rst
 %%DATADIR%%/Help/prop_test/WILL_FAIL.rst
 %%DATADIR%%/Help/prop_test/WORKING_DIRECTORY.rst
 %%DATADIR%%/Help/prop_tgt/ALIASED_TARGET.rst
@@ -657,6 +660,7 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/prop_tgt/C_STANDARD_REQUIRED.rst
 %%DATADIR%%/Help/prop_tgt/DEBUG_POSTFIX.rst
 %%DATADIR%%/Help/prop_tgt/DEFINE_SYMBOL.rst
+%%DATADIR%%/Help/prop_tgt/DEPLOYMENT_REMOTE_DIRECTORY.rst
 %%DATADIR%%/Help/prop_tgt/ENABLE_EXPORTS.rst
 %%DATADIR%%/Help/prop_tgt/EXCLUDE_FROM_ALL.rst
 %%DATADIR%%/Help/prop_tgt/EXCLUDE_FROM_DEFAULT_BUILD.rst
@@ -712,6 +716,7 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/prop_tgt/JOB_POOL_COMPILE.rst
 %%DATADIR%%/Help/prop_tgt/JOB_POOL_LINK.rst
 %%DATADIR%%/Help/prop_tgt/LABELS.rst
+%%DATADIR%%/Help/prop_tgt/LANG_CLANG_TIDY.rst
 %%DATADIR%%/Help/prop_tgt/LANG_COMPILER_LAUNCHER.rst
 %%DATADIR%%/Help/prop_tgt/LANG_INCLUDE_WHAT_YOU_USE.rst
 %%DATADIR%%/Help/prop_tgt/LANG_VISIBILITY_PRESET.rst
@@ -775,6 +780,7 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/prop_tgt/TYPE.rst
 %%DATADIR%%/Help/prop_tgt/VERSION.rst
 %%DATADIR%%/Help/prop_tgt/VISIBILITY_INLINES_HIDDEN.rst
+%%DATADIR%%/Help/prop_tgt/VS_CONFIGURATION_TYPE.rst
 %%DATADIR%%/Help/prop_tgt/VS_DESKTOP_EXTENSIONS_VERSION.rst
 %%DATADIR%%/Help/prop_tgt/VS_DOTNET_REFERENCES.rst
 %%DATADIR%%/Help/prop_tgt/VS_DOTNET_TARGET_FRAMEWORK_VERSION.rst
@@ -806,6 +812,7 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/release/3.3.rst
 %%DATADIR%%/Help/release/3.4.rst
 %%DATADIR%%/Help/release/3.5.rst
+%%DATADIR%%/Help/release/3.6.rst
 %%DATADIR%%/Help/release/dev.txt
 %%DATADIR%%/Help/release/index.rst
 %%DATADIR%%/Help/variable/APPLE.rst
@@ -879,8 +886,13 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/variable/CMAKE_C_STANDARD_REQUIRED.rst
 %%DATADIR%%/Help/variable/CMAKE_DEBUG_POSTFIX.rst
 %%DATADIR%%/Help/variable/CMAKE_DEBUG_TARGET_PROPERTIES.rst
+%%DATADIR%%/Help/variable/CMAKE_DEPENDS_IN_PROJECT_ONLY.rst
 %%DATADIR%%/Help/variable/CMAKE_DISABLE_FIND_PACKAGE_PackageName.rst
 %%DATADIR%%/Help/variable/CMAKE_DL_LIBS.rst
+%%DATADIR%%/Help/variable/CMAKE_ECLIPSE_GENERATE_LINKED_RESOURCES.rst
+%%DATADIR%%/Help/variable/CMAKE_ECLIPSE_GENERATE_SOURCE_PROJECT.rst
+%%DATADIR%%/Help/variable/CMAKE_ECLIPSE_MAKE_ARGUMENTS.rst
+%%DATADIR%%/Help/variable/CMAKE_ECLIPSE_VERSION.rst
 %%DATADIR%%/Help/variable/CMAKE_EDIT_COMMAND.rst
 %%DATADIR%%/Help/variable/CMAKE_ENABLE_EXPORTS.rst
 %%DATADIR%%/Help/variable/CMAKE_ERROR_DEPRECATED.rst
@@ -919,6 +931,7 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/variable/CMAKE_GNUtoMS.rst
 %%DATADIR%%/Help/variable/CMAKE_HOME_DIRECTORY.rst
 %%DATADIR%%/Help/variable/CMAKE_HOST_APPLE.rst
+%%DATADIR%%/Help/variable/CMAKE_HOST_SOLARIS.rst
 %%DATADIR%%/Help/variable/CMAKE_HOST_SYSTEM.rst
 %%DATADIR%%/Help/variable/CMAKE_HOST_SYSTEM_NAME.rst
 %%DATADIR%%/Help/variable/CMAKE_HOST_SYSTEM_PROCESSOR.rst
@@ -946,6 +959,7 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/variable/CMAKE_LANG_ARCHIVE_APPEND.rst
 %%DATADIR%%/Help/variable/CMAKE_LANG_ARCHIVE_CREATE.rst
 %%DATADIR%%/Help/variable/CMAKE_LANG_ARCHIVE_FINISH.rst
+%%DATADIR%%/Help/variable/CMAKE_LANG_CLANG_TIDY.rst
 %%DATADIR%%/Help/variable/CMAKE_LANG_COMPILER.rst
 %%DATADIR%%/Help/variable/CMAKE_LANG_COMPILER_ABI.rst
 %%DATADIR%%/Help/variable/CMAKE_LANG_COMPILER_EXTERNAL_TOOLCHAIN.rst
@@ -983,6 +997,8 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/variable/CMAKE_LANG_SIMULATE_VERSION.rst
 %%DATADIR%%/Help/variable/CMAKE_LANG_SIZEOF_DATA_PTR.rst
 %%DATADIR%%/Help/variable/CMAKE_LANG_SOURCE_FILE_EXTENSIONS.rst
+%%DATADIR%%/Help/variable/CMAKE_LANG_STANDARD_INCLUDE_DIRECTORIES.rst
+%%DATADIR%%/Help/variable/CMAKE_LANG_STANDARD_LIBRARIES.rst
 %%DATADIR%%/Help/variable/CMAKE_LANG_VISIBILITY_PRESET.rst
 %%DATADIR%%/Help/variable/CMAKE_LIBRARY_ARCHITECTURE.rst
 %%DATADIR%%/Help/variable/CMAKE_LIBRARY_ARCHITECTURE_REGEX.rst
@@ -1010,6 +1026,7 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/variable/CMAKE_MODULE_LINKER_FLAGS.rst
 %%DATADIR%%/Help/variable/CMAKE_MODULE_LINKER_FLAGS_CONFIG.rst
 %%DATADIR%%/Help/variable/CMAKE_MODULE_PATH.rst
+%%DATADIR%%/Help/variable/CMAKE_NINJA_OUTPUT_PATH_PREFIX.rst
 %%DATADIR%%/Help/variable/CMAKE_NOT_USING_CONFIG_FLAGS.rst
 %%DATADIR%%/Help/variable/CMAKE_NO_BUILTIN_CHRPATH.rst
 %%DATADIR%%/Help/variable/CMAKE_NO_SYSTEM_FROM_IMPORTED.rst
@@ -1048,7 +1065,6 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/variable/CMAKE_SKIP_RPATH.rst
 %%DATADIR%%/Help/variable/CMAKE_SOURCE_DIR.rst
 %%DATADIR%%/Help/variable/CMAKE_STAGING_PREFIX.rst
-%%DATADIR%%/Help/variable/CMAKE_STANDARD_LIBRARIES.rst
 %%DATADIR%%/Help/variable/CMAKE_STATIC_LIBRARY_PREFIX.rst
 %%DATADIR%%/Help/variable/CMAKE_STATIC_LIBRARY_SUFFIX.rst
 %%DATADIR%%/Help/variable/CMAKE_STATIC_LINKER_FLAGS.rst
@@ -1067,6 +1083,8 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/variable/CMAKE_SYSTEM_VERSION.rst
 %%DATADIR%%/Help/variable/CMAKE_TOOLCHAIN_FILE.rst
 %%DATADIR%%/Help/variable/CMAKE_TRY_COMPILE_CONFIGURATION.rst
+%%DATADIR%%/Help/variable/CMAKE_TRY_COMPILE_PLATFORM_VARIABLES.rst
+%%DATADIR%%/Help/variable/CMAKE_TRY_COMPILE_TARGET_TYPE.rst
 %%DATADIR%%/Help/variable/CMAKE_TWEAK_VERSION.rst
 %%DATADIR%%/Help/variable/CMAKE_USER_MAKE_RULES_OVERRIDE.rst
 %%DATADIR%%/Help/variable/CMAKE_USER_MAKE_RULES_OVERRIDE_LANG.rst
@@ -1078,7 +1096,6 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/variable/CMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD.rst
 %%DATADIR%%/Help/variable/CMAKE_VS_INTEL_Fortran_PROJECT_VERSION.rst
 %%DATADIR%%/Help/variable/CMAKE_VS_MSBUILD_COMMAND.rst
-%%DATADIR%%/Help/variable/CMAKE_VS_MSDEV_COMMAND.rst
 %%DATADIR%%/Help/variable/CMAKE_VS_NsightTegra_VERSION.rst
 %%DATADIR%%/Help/variable/CMAKE_VS_PLATFORM_NAME.rst
 %%DATADIR%%/Help/variable/CMAKE_VS_PLATFORM_TOOLSET.rst
@@ -1138,6 +1155,7 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/variable/CTEST_DROP_SITE_USER.rst
 %%DATADIR%%/Help/variable/CTEST_EXTRA_COVERAGE_GLOB.rst
 %%DATADIR%%/Help/variable/CTEST_GIT_COMMAND.rst
+%%DATADIR%%/Help/variable/CTEST_GIT_INIT_SUBMODULES.rst
 %%DATADIR%%/Help/variable/CTEST_GIT_UPDATE_CUSTOM.rst
 %%DATADIR%%/Help/variable/CTEST_GIT_UPDATE_OPTIONS.rst
 %%DATADIR%%/Help/variable/CTEST_HG_COMMAND.rst