Update CMake to 3.1.0.

Upstream release notes:
http://www.cmake.org/cmake/help/v3.1/release/3.1.0.html

Notable changes on the packaging side:
* devel/cmake does not need USE_OPENSSL=yes anymore. In fact, it has not
  needed it since r366996, when we stopped building CMake's bundled copies
  of curl, libarchive & friends (curl was the only consumer of OpenSSL in
  CMake).

* Likewise, we do not need to set CMAKE_USE_OPENSSL in InitialCache.cmake
  anymore.

* On FreeBSD < 10, devel/cmake and devel/cmake-gui now depend on
  archivers/libarchive because the libarchive version in base is too old and
  does not contain some functions that CMake uses.

PR:		196367

8 files changed, 212 insertions, 59 deletions

diff --git a/devel/cmake-gui/Makefile b/devel/cmake-gui/Makefile
index d5d72b24a3d0..e0256349e5de 100644
--- a/devel/cmake-gui/Makefile
+++ b/devel/cmake-gui/Makefile
@@ -1,9 +1,9 @@
 # $FreeBSD$
 
 PORTNAME=	cmake
-PORTVERSION=	3.0.2
+PORTVERSION=	3.1.0
 CATEGORIES=	devel
-MASTER_SITES=	http://www.cmake.org/files/v3.0/
+MASTER_SITES=	http://www.cmake.org/files/v3.1/
 PKGNAMESUFFIX=	-gui
 
 MAINTAINER=	kde@FreeBSD.org
@@ -29,6 +29,14 @@ INSTALL_WRKSRC=	${WRKSRC}/Source/QtDialog
 
 DISTINFO_FILE=	${.CURDIR}/../cmake/distinfo
 
+.include <bsd.port.pre.mk>
+
+# CMake >= 3.1.0 needs libarchive3 because it calls
+# archive_entry_copy_sourcepath_w and archive_write_set_format_7zip.
+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000009
+LIB_DEPENDS+=	libarchive.so.13:${PORTSDIR}/archivers/libarchive
+.endif
+
 post-patch:
 	@(${FIND} ${WRKSRC}/Modules -name "*.cmake" -print0; \
 		${FIND} ${WRKSRC}/Tests -name "CMakeLists.txt" -print0 ) | \
@@ -42,4 +50,4 @@ post-install:
 	${INSTALL_MAN} ${WRKSRC}/Utilities/Sphinx/man/cmake-gui.1 \
 		${STAGEDIR}${PREFIX}/man/man1
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/devel/cmake-modules/pkg-plist b/devel/cmake-modules/pkg-plist
index e01a10c539b5..6d7959bf4e3a 100644
--- a/devel/cmake-modules/pkg-plist
+++ b/devel/cmake-modules/pkg-plist
@@ -30,6 +30,7 @@
 %%DATADIR%%/Modules/CMakeCheckCompilerFlagCommonPatterns.cmake
 %%DATADIR%%/Modules/CMakeCommonLanguageInclude.cmake
 %%DATADIR%%/Modules/CMakeCompilerABI.h
+%%DATADIR%%/Modules/CMakeCompilerIdDetection.cmake
 %%DATADIR%%/Modules/CMakeConfigurableFile.in
 %%DATADIR%%/Modules/CMakeDependentOption.cmake
 %%DATADIR%%/Modules/CMakeDetermineASM-ATTCompiler.cmake
@@ -40,6 +41,7 @@
 %%DATADIR%%/Modules/CMakeDetermineCXXCompiler.cmake
 %%DATADIR%%/Modules/CMakeDetermineCompiler.cmake
 %%DATADIR%%/Modules/CMakeDetermineCompilerABI.cmake
+%%DATADIR%%/Modules/CMakeDetermineCompileFeatures.cmake
 %%DATADIR%%/Modules/CMakeDetermineCompilerId.cmake
 %%DATADIR%%/Modules/CMakeDetermineFortranCompiler.cmake
 %%DATADIR%%/Modules/CMakeDetermineJavaCompiler.cmake
@@ -86,6 +88,7 @@
 %%DATADIR%%/Modules/CMakeRCInformation.cmake
 %%DATADIR%%/Modules/CMakeSystem.cmake.in
 %%DATADIR%%/Modules/CMakeSystemSpecificInformation.cmake
+%%DATADIR%%/Modules/CMakeSystemSpecificInitialize.cmake
 %%DATADIR%%/Modules/CMakeTestASM-ATTCompiler.cmake
 %%DATADIR%%/Modules/CMakeTestASMCompiler.cmake
 %%DATADIR%%/Modules/CMakeTestASM_MASMCompiler.cmake
@@ -120,6 +123,7 @@
 %%DATADIR%%/Modules/CPackCygwin.cmake
 %%DATADIR%%/Modules/CPackDMG.cmake
 %%DATADIR%%/Modules/CPackDeb.cmake
+%%DATADIR%%/Modules/CPackIFW.cmake
 %%DATADIR%%/Modules/CPackNSIS.cmake
 %%DATADIR%%/Modules/CPackPackageMaker.cmake
 %%DATADIR%%/Modules/CPackRPM.cmake
@@ -138,6 +142,7 @@
 %%DATADIR%%/Modules/CheckCXXSymbolExists.cmake
 %%DATADIR%%/Modules/CheckForPthreads.c
 %%DATADIR%%/Modules/CheckFortranFunctionExists.cmake
+%%DATADIR%%/Modules/CheckFortranSourceCompiles.cmake
 %%DATADIR%%/Modules/CheckFunctionExists.c
 %%DATADIR%%/Modules/CheckFunctionExists.cmake
 %%DATADIR%%/Modules/CheckIncludeFile.c.in
@@ -158,45 +163,72 @@
 %%DATADIR%%/Modules/CheckTypeSizeMap.cmake.in
 %%DATADIR%%/Modules/CheckVariableExists.c
 %%DATADIR%%/Modules/CheckVariableExists.cmake
+%%DATADIR%%/Modules/Compiler/ADSP-DetermineCompiler.cmake
 %%DATADIR%%/Modules/Compiler/Absoft-Fortran.cmake
 %%DATADIR%%/Modules/Compiler/AppleClang-ASM.cmake
 %%DATADIR%%/Modules/Compiler/AppleClang-C.cmake
 %%DATADIR%%/Modules/Compiler/AppleClang-CXX.cmake
+%%DATADIR%%/Modules/Compiler/AppleClang-DetermineCompiler.cmake
+%%DATADIR%%/Modules/Compiler/Borland-DetermineCompiler.cmake
 %%DATADIR%%/Modules/Compiler/Clang-ASM.cmake
+%%DATADIR%%/Modules/Compiler/Clang-C-FeatureTests.cmake
 %%DATADIR%%/Modules/Compiler/Clang-C.cmake
+%%DATADIR%%/Modules/Compiler/Clang-CXX-FeatureTests.cmake
 %%DATADIR%%/Modules/Compiler/Clang-CXX.cmake
+%%DATADIR%%/Modules/Compiler/Clang-DetermineCompiler.cmake
+%%DATADIR%%/Modules/Compiler/Clang-DetermineCompilerInternal.cmake
 %%DATADIR%%/Modules/Compiler/Clang.cmake
+%%DATADIR%%/Modules/Compiler/Comeau-CXX-DetermineCompiler.cmake
+%%DATADIR%%/Modules/Compiler/Compaq-C-DetermineCompiler.cmake
+%%DATADIR%%/Modules/Compiler/Compaq-CXX-DetermineCompiler.cmake
 %%DATADIR%%/Modules/Compiler/Cray-C.cmake
 %%DATADIR%%/Modules/Compiler/Cray-CXX.cmake
+%%DATADIR%%/Modules/Compiler/Cray-DetermineCompiler.cmake
 %%DATADIR%%/Modules/Compiler/Cray-Fortran.cmake
+%%DATADIR%%/Modules/Compiler/Embarcadero-DetermineCompiler.cmake
+%%DATADIR%%/Modules/Compiler/Fujitsu-DetermineCompiler.cmake
 %%DATADIR%%/Modules/Compiler/G95-Fortran.cmake
 %%DATADIR%%/Modules/Compiler/GNU-ASM.cmake
+%%DATADIR%%/Modules/Compiler/GNU-C-FeatureTests.cmake
 %%DATADIR%%/Modules/Compiler/GNU-C.cmake
+%%DATADIR%%/Modules/Compiler/GNU-CXX-FeatureTests.cmake
 %%DATADIR%%/Modules/Compiler/GNU-CXX.cmake
+%%DATADIR%%/Modules/Compiler/GNU-DetermineCompiler.cmake
 %%DATADIR%%/Modules/Compiler/GNU-Fortran.cmake
 %%DATADIR%%/Modules/Compiler/GNU.cmake
 %%DATADIR%%/Modules/Compiler/HP-ASM.cmake
+%%DATADIR%%/Modules/Compiler/HP-C-DetermineCompiler.cmake
 %%DATADIR%%/Modules/Compiler/HP-C.cmake
+%%DATADIR%%/Modules/Compiler/HP-CXX-DetermineCompiler.cmake
 %%DATADIR%%/Modules/Compiler/HP-CXX.cmake
 %%DATADIR%%/Modules/Compiler/HP-Fortran.cmake
 %%DATADIR%%/Modules/Compiler/IAR-ASM.cmake
 %%DATADIR%%/Modules/Compiler/IAR-C.cmake
 %%DATADIR%%/Modules/Compiler/IAR-CXX.cmake
+%%DATADIR%%/Modules/Compiler/IAR-DetermineCompiler.cmake
 %%DATADIR%%/Modules/Compiler/IAR.cmake
+%%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.cmake
 %%DATADIR%%/Modules/Compiler/Intel-CXX.cmake
+%%DATADIR%%/Modules/Compiler/Intel-DetermineCompiler.cmake
 %%DATADIR%%/Modules/Compiler/Intel-Fortran.cmake
 %%DATADIR%%/Modules/Compiler/MIPSpro-C.cmake
 %%DATADIR%%/Modules/Compiler/MIPSpro-CXX.cmake
+%%DATADIR%%/Modules/Compiler/MIPSpro-DetermineCompiler.cmake
 %%DATADIR%%/Modules/Compiler/MIPSpro-Fortran.cmake
+%%DATADIR%%/Modules/Compiler/MSVC-DetermineCompiler.cmake
 %%DATADIR%%/Modules/Compiler/NAG-Fortran.cmake
+%%DATADIR%%/Modules/Compiler/OpenWatcom-DetermineCompiler.cmake
 %%DATADIR%%/Modules/Compiler/PGI-C.cmake
 %%DATADIR%%/Modules/Compiler/PGI-CXX.cmake
+%%DATADIR%%/Modules/Compiler/PGI-DetermineCompiler.cmake
 %%DATADIR%%/Modules/Compiler/PGI-Fortran.cmake
 %%DATADIR%%/Modules/Compiler/PGI.cmake
 %%DATADIR%%/Modules/Compiler/PathScale-C.cmake
 %%DATADIR%%/Modules/Compiler/PathScale-CXX.cmake
+%%DATADIR%%/Modules/Compiler/PathScale-DetermineCompiler.cmake
 %%DATADIR%%/Modules/Compiler/PathScale-Fortran.cmake
 %%DATADIR%%/Modules/Compiler/PathScale.cmake
 %%DATADIR%%/Modules/Compiler/QCC-C.cmake
@@ -204,27 +236,41 @@
 %%DATADIR%%/Modules/Compiler/QCC.cmake
 %%DATADIR%%/Modules/Compiler/SCO-C.cmake
 %%DATADIR%%/Modules/Compiler/SCO-CXX.cmake
+%%DATADIR%%/Modules/Compiler/SCO-DetermineCompiler.cmake
 %%DATADIR%%/Modules/Compiler/SCO.cmake
+%%DATADIR%%/Modules/Compiler/SDCC-C-DetermineCompiler.cmake
 %%DATADIR%%/Modules/Compiler/SunPro-ASM.cmake
+%%DATADIR%%/Modules/Compiler/SunPro-C-DetermineCompiler.cmake
 %%DATADIR%%/Modules/Compiler/SunPro-C.cmake
+%%DATADIR%%/Modules/Compiler/SunPro-CXX-DetermineCompiler.cmake
 %%DATADIR%%/Modules/Compiler/SunPro-CXX.cmake
 %%DATADIR%%/Modules/Compiler/SunPro-Fortran.cmake
 %%DATADIR%%/Modules/Compiler/TI-ASM.cmake
 %%DATADIR%%/Modules/Compiler/TI-C.cmake
 %%DATADIR%%/Modules/Compiler/TI-CXX.cmake
+%%DATADIR%%/Modules/Compiler/TI-DetermineCompiler.cmake
+%%DATADIR%%/Modules/Compiler/TinyCC-C-DetermineCompiler.cmake
 %%DATADIR%%/Modules/Compiler/TinyCC-C.cmake
+%%DATADIR%%/Modules/Compiler/VisualAge-C-DetermineCompiler.cmake
 %%DATADIR%%/Modules/Compiler/VisualAge-C.cmake
+%%DATADIR%%/Modules/Compiler/VisualAge-CXX-DetermineCompiler.cmake
 %%DATADIR%%/Modules/Compiler/VisualAge-CXX.cmake
 %%DATADIR%%/Modules/Compiler/VisualAge-Fortran.cmake
+%%DATADIR%%/Modules/Compiler/Watcom-DetermineCompiler.cmake
 %%DATADIR%%/Modules/Compiler/XL-ASM.cmake
+%%DATADIR%%/Modules/Compiler/XL-C-DetermineCompiler.cmake
 %%DATADIR%%/Modules/Compiler/XL-C.cmake
+%%DATADIR%%/Modules/Compiler/XL-CXX-DetermineCompiler.cmake
 %%DATADIR%%/Modules/Compiler/XL-CXX.cmake
 %%DATADIR%%/Modules/Compiler/XL-Fortran.cmake
 %%DATADIR%%/Modules/Compiler/XL.cmake
+%%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
 %%DATADIR%%/Modules/CompilerId/Xcode-1.pbxproj.in
 %%DATADIR%%/Modules/CompilerId/Xcode-2.pbxproj.in
 %%DATADIR%%/Modules/CompilerId/Xcode-3.pbxproj.in
@@ -286,7 +332,7 @@
 %%DATADIR%%/Modules/FindHSPELL.cmake
 %%DATADIR%%/Modules/FindHTMLHelp.cmake
 %%DATADIR%%/Modules/FindHg.cmake
-%%DATADIR%%/Modules/FindITK.cmake
+%%DATADIR%%/Modules/FindIce.cmake
 %%DATADIR%%/Modules/FindIcotool.cmake
 %%DATADIR%%/Modules/FindImageMagick.cmake
 %%DATADIR%%/Modules/FindJNI.cmake
@@ -311,6 +357,7 @@
 %%DATADIR%%/Modules/FindMatlab.cmake
 %%DATADIR%%/Modules/FindMotif.cmake
 %%DATADIR%%/Modules/FindOpenAL.cmake
+%%DATADIR%%/Modules/FindOpenCL.cmake
 %%DATADIR%%/Modules/FindOpenGL.cmake
 %%DATADIR%%/Modules/FindOpenMP.cmake
 %%DATADIR%%/Modules/FindOpenSSL.cmake
@@ -352,11 +399,11 @@
 %%DATADIR%%/Modules/FindTclsh.cmake
 %%DATADIR%%/Modules/FindThreads.cmake
 %%DATADIR%%/Modules/FindUnixCommands.cmake
-%%DATADIR%%/Modules/FindVTK.cmake
 %%DATADIR%%/Modules/FindWget.cmake
 %%DATADIR%%/Modules/FindWish.cmake
 %%DATADIR%%/Modules/FindX11.cmake
 %%DATADIR%%/Modules/FindXMLRPC.cmake
+%%DATADIR%%/Modules/FindXercesC.cmake
 %%DATADIR%%/Modules/FindZLIB.cmake
 %%DATADIR%%/Modules/Findosg.cmake
 %%DATADIR%%/Modules/FindosgAnimation.cmake
@@ -409,6 +456,7 @@
 %%DATADIR%%/Modules/IntelVSImplicitPath/CMakeLists.txt
 %%DATADIR%%/Modules/IntelVSImplicitPath/detect.cmake
 %%DATADIR%%/Modules/IntelVSImplicitPath/hello.f
+%%DATADIR%%/Modules/Internal/FeatureTesting.cmake
 %%DATADIR%%/Modules/KDE3Macros.cmake
 %%DATADIR%%/Modules/MacOSXBundleInfo.plist.in
 %%DATADIR%%/Modules/MacOSXFrameworkInfo.plist.in
@@ -429,6 +477,7 @@
 %%DATADIR%%/Modules/Platform/AIX-XL-Fortran.cmake
 %%DATADIR%%/Modules/Platform/AIX-XL.cmake
 %%DATADIR%%/Modules/Platform/AIX.cmake
+%%DATADIR%%/Modules/Platform/Android.cmake
 %%DATADIR%%/Modules/Platform/BSDOS.cmake
 %%DATADIR%%/Modules/Platform/BeOS.cmake
 %%DATADIR%%/Modules/Platform/BlueGeneL.cmake
@@ -466,6 +515,7 @@
 %%DATADIR%%/Modules/Platform/Darwin-GNU-CXX.cmake
 %%DATADIR%%/Modules/Platform/Darwin-GNU-Fortran.cmake
 %%DATADIR%%/Modules/Platform/Darwin-GNU.cmake
+%%DATADIR%%/Modules/Platform/Darwin-Initialize.cmake
 %%DATADIR%%/Modules/Platform/Darwin-Intel-C.cmake
 %%DATADIR%%/Modules/Platform/Darwin-Intel-CXX.cmake
 %%DATADIR%%/Modules/Platform/Darwin-Intel-Fortran.cmake
@@ -583,9 +633,14 @@
 %%DATADIR%%/Modules/Platform/Windows.cmake
 %%DATADIR%%/Modules/Platform/WindowsCE-MSVC-C.cmake
 %%DATADIR%%/Modules/Platform/WindowsCE-MSVC-CXX.cmake
-%%DATADIR%%/Modules/Platform/WindowsCE-MSVC.cmake
 %%DATADIR%%/Modules/Platform/WindowsCE.cmake
 %%DATADIR%%/Modules/Platform/WindowsPaths.cmake
+%%DATADIR%%/Modules/Platform/WindowsPhone-MSVC-C.cmake
+%%DATADIR%%/Modules/Platform/WindowsPhone-MSVC-CXX.cmake
+%%DATADIR%%/Modules/Platform/WindowsPhone.cmake
+%%DATADIR%%/Modules/Platform/WindowsStore-MSVC-C.cmake
+%%DATADIR%%/Modules/Platform/WindowsStore-MSVC-CXX.cmake
+%%DATADIR%%/Modules/Platform/WindowsStore.cmake
 %%DATADIR%%/Modules/Platform/Xenix.cmake
 %%DATADIR%%/Modules/Platform/eCos.cmake
 %%DATADIR%%/Modules/Platform/gas.cmake
@@ -629,6 +684,7 @@
 %%DATADIR%%/Modules/VTKCompatibility.cmake
 %%DATADIR%%/Modules/WIX.template.in
 %%DATADIR%%/Modules/WriteBasicConfigVersionFile.cmake
+%%DATADIR%%/Modules/WriteCompilerDetectionHeader.cmake
 %%DATADIR%%/Modules/ecos_clean.cmake
 %%DATADIR%%/Modules/exportheader.cmake.in
 %%DATADIR%%/Modules/kde3init_dummy.cpp.in
@@ -651,6 +707,12 @@
 %%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
+%%DATADIR%%/Templates/Windows/SplashScreen.png
+%%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 2cf4f0f2e24a..13ee0be087fe 100644
--- a/devel/cmake/Makefile
+++ b/devel/cmake/Makefile
@@ -2,10 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	cmake
-PORTVERSION=	3.0.2
+PORTVERSION=	3.1.0
 PORTREVISION?=	0
 CATEGORIES=	devel
-MASTER_SITES=	http://www.cmake.org/files/v3.0/
+MASTER_SITES=	http://www.cmake.org/files/v3.1/
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT?=	Cross-platform Makefile generator
@@ -13,7 +13,6 @@ COMMENT?=	Cross-platform Makefile generator
 LICENSE=	BSD3CLAUSE
 
 USE_KDE4=	# env
-USE_OPENSSL=	yes
 CONFIGURE_ENV=	MAKE=make
 CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--datadir="/${DATADIR_REL}" \
@@ -40,6 +39,14 @@ RUN_DEPENDS=	${LOCALBASE}/share/cmake/Modules/CMake.cmake:${PORTSDIR}/devel/cmak
 INSTALL_TARGET=	install/strip
 .endif
 
+.if !defined(CMAKE_MODULES)
+# CMake >= 3.1.0 needs libarchive3 because it calls
+# archive_entry_copy_sourcepath_w and archive_write_set_format_7zip.
+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000009
+LIB_DEPENDS+=	libarchive.so.13:${PORTSDIR}/archivers/libarchive
+.endif  # ${OPSYS} == FreeBSD && ${OSVERSION} < 1000009
+.endif  # !defined(CMAKE_MODULES)
+
 post-patch:
 	@(${FIND} ${WRKSRC}/Modules -name "*.cmake" -print0; \
 		${FIND} ${WRKSRC}/Tests -name "CMakeLists.txt" -print0 ) | \
diff --git a/devel/cmake/distinfo b/devel/cmake/distinfo
index 5f97151a382d..750b1d66b92b 100644
--- a/devel/cmake/distinfo
+++ b/devel/cmake/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cmake-3.0.2.tar.gz) = 6b4ea61eadbbd9bec0ccb383c29d1f4496eacc121ef7acf37c7a24777805693e
-SIZE (cmake-3.0.2.tar.gz) = 5490501
+SHA256 (cmake-3.1.0.tar.gz) = 8bdc3fa3f2da81bc10c772a6b64cc9052acc2901d42e1e1b2588b40df224aad9
+SIZE (cmake-3.1.0.tar.gz) = 5955836
diff --git a/devel/cmake/files/InitialCache.cmake b/devel/cmake/files/InitialCache.cmake
index b64391a9d82e..de214871c9e4 100644
--- a/devel/cmake/files/InitialCache.cmake
+++ b/devel/cmake/files/InitialCache.cmake
@@ -4,7 +4,3 @@
 # devel/qt4-corelib is not).
 # See https://mail.kde.org/pipermail/kde-freebsd/2013-July/015703.html
 set(BUILD_TESTING OFF CACHE BOOL "Build the testing tree.")
-
-# Explicitly enable use of OpenSSL in the bundled copy of libcurl, as it
-# defaults to off. See ports/187374.
-set(CMAKE_USE_OPENSSL ON CACHE BOOL "Use OpenSSL code with curl.")
diff --git a/devel/cmake/files/patch-CMakeLists.txt b/devel/cmake/files/patch-CMakeLists.txt
index 8c987a8d8bf0..1937d9091bb4 100644
--- a/devel/cmake/files/patch-CMakeLists.txt
+++ b/devel/cmake/files/patch-CMakeLists.txt
@@ -3,12 +3,12 @@ Modules/ and Templates/ are installed by devel/cmake-modules.
 Not upstreamable.
 --- CMakeLists.txt.orig
 +++ CMakeLists.txt
-@@ -576,7 +576,7 @@
+@@ -605,7 +605,7 @@
  
- # Install script directories.
- install(
--  DIRECTORY Help Modules Templates
-+  DIRECTORY Help
-   DESTINATION ${CMAKE_DATA_DIR}
-   FILE_PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
-   DIRECTORY_PERMISSIONS OWNER_READ OWNER_EXECUTE OWNER_WRITE
+   # Install script directories.
+   install(
+-    DIRECTORY Help Modules Templates
++    DIRECTORY Help
+     DESTINATION ${CMAKE_DATA_DIR}
+     FILE_PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
+     DIRECTORY_PERMISSIONS OWNER_READ OWNER_EXECUTE OWNER_WRITE
diff --git a/devel/cmake/files/patch-Utilities__cmcurl__CMakeLists.txt b/devel/cmake/files/patch-Utilities__cmcurl__CMakeLists.txt
deleted file mode 100644
index 32b5b0ee348d..000000000000
--- a/devel/cmake/files/patch-Utilities__cmcurl__CMakeLists.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-cmcurl: Include the local curl directories before all others.
-
-In some cases, it was possible for the include directory of the system-wide
-libcurl to be added to the include path before cmcurl's, which would result
-in them being picked up and causing the build to fail if the curl versions
-differ too much.
-
-One way to trigger this is to have OpenSSL installed into a non-default
-location together with libcurl (/usr/local, for example). If cmcurl is built
-with CMAKE_USE_OPENSSL on, -I/usr/local/include would end up being added
-before -I${PATH_TO_CMCURL}.
-
-Sent upstream: http://public.kitware.com/pipermail/cmake-developers/2014-March/010000.html
---- Utilities/cmcurl/CMakeLists.txt
-+++ Utilities/cmcurl/CMakeLists.txt
-@@ -172,6 +172,11 @@ IF(NOT CURL_SPECIAL_LIBZ)
-   CHECK_LIBRARY_EXISTS_CONCAT("z"      inflateEnd   HAVE_LIBZ)
- ENDIF(NOT CURL_SPECIAL_LIBZ)
- 
-+# Include the local directories before any others so that we do not end up
-+# including system curl's include directory first by mistake.
-+INCLUDE_DIRECTORIES(${LIBCURL_SOURCE_DIR})
-+INCLUDE_DIRECTORIES(${LIBCURL_BINARY_DIR})
-+
- OPTION(CMAKE_USE_OPENSSL "Use OpenSSL code with curl." OFF)
- MARK_AS_ADVANCED(CMAKE_USE_OPENSSL)
- IF(CMAKE_USE_OPENSSL)
-@@ -679,8 +684,6 @@ INCLUDE(CMake/OtherTests.cmake)
- 
- # The rest of the build
- 
--INCLUDE_DIRECTORIES(${LIBCURL_SOURCE_DIR})
--INCLUDE_DIRECTORIES(${LIBCURL_BINARY_DIR})
- OPTION(CMAKE_BUILD_CURL_SHARED "Should curl be built shared" TRUE)
- IF(CMAKE_BUILD_CURL_SHARED)
-   SET(LIBRARY_TYPE SHARED)
diff --git a/devel/cmake/pkg-plist b/devel/cmake/pkg-plist
index dffe82f90087..1bb4232ce195 100644
--- a/devel/cmake/pkg-plist
+++ b/devel/cmake/pkg-plist
@@ -8,6 +8,7 @@ man/man1/cpack.1.gz
 man/man1/ctest.1.gz
 man/man7/cmake-buildsystem.7.gz
 man/man7/cmake-commands.7.gz
+man/man7/cmake-compile-features.7.gz
 man/man7/cmake-developer.7.gz
 man/man7/cmake-generator-expressions.7.gz
 man/man7/cmake-generators.7.gz
@@ -125,9 +126,11 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/command/subdir_depends.rst
 %%DATADIR%%/Help/command/subdirs.rst
 %%DATADIR%%/Help/command/target_compile_definitions.rst
+%%DATADIR%%/Help/command/target_compile_features.rst
 %%DATADIR%%/Help/command/target_compile_options.rst
 %%DATADIR%%/Help/command/target_include_directories.rst
 %%DATADIR%%/Help/command/target_link_libraries.rst
+%%DATADIR%%/Help/command/target_sources.rst
 %%DATADIR%%/Help/command/try_compile.rst
 %%DATADIR%%/Help/command/try_run.rst
 %%DATADIR%%/Help/command/unset.rst
@@ -153,6 +156,7 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/generator/Visual Studio 10 2010.rst
 %%DATADIR%%/Help/generator/Visual Studio 11 2012.rst
 %%DATADIR%%/Help/generator/Visual Studio 12 2013.rst
+%%DATADIR%%/Help/generator/Visual Studio 14 2015.rst
 %%DATADIR%%/Help/generator/Visual Studio 6.rst
 %%DATADIR%%/Help/generator/Visual Studio 7 .NET 2003.rst
 %%DATADIR%%/Help/generator/Visual Studio 7.rst
@@ -168,6 +172,7 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/manual/ccmake.1.rst
 %%DATADIR%%/Help/manual/cmake-buildsystem.7.rst
 %%DATADIR%%/Help/manual/cmake-commands.7.rst
+%%DATADIR%%/Help/manual/cmake-compile-features.7.rst
 %%DATADIR%%/Help/manual/cmake-developer.7.rst
 %%DATADIR%%/Help/manual/cmake-generator-expressions.7.rst
 %%DATADIR%%/Help/manual/cmake-generators.7.rst
@@ -206,6 +211,7 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/module/CPackCygwin.rst
 %%DATADIR%%/Help/module/CPackDMG.rst
 %%DATADIR%%/Help/module/CPackDeb.rst
+%%DATADIR%%/Help/module/CPackIFW.rst
 %%DATADIR%%/Help/module/CPackNSIS.rst
 %%DATADIR%%/Help/module/CPackPackageMaker.rst
 %%DATADIR%%/Help/module/CPackRPM.rst
@@ -221,6 +227,7 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/module/CheckCXXSourceRuns.rst
 %%DATADIR%%/Help/module/CheckCXXSymbolExists.rst
 %%DATADIR%%/Help/module/CheckFortranFunctionExists.rst
+%%DATADIR%%/Help/module/CheckFortranSourceCompiles.rst
 %%DATADIR%%/Help/module/CheckFunctionExists.rst
 %%DATADIR%%/Help/module/CheckIncludeFile.rst
 %%DATADIR%%/Help/module/CheckIncludeFileCXX.rst
@@ -283,6 +290,7 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/module/FindHTMLHelp.rst
 %%DATADIR%%/Help/module/FindHg.rst
 %%DATADIR%%/Help/module/FindITK.rst
+%%DATADIR%%/Help/module/FindIce.rst
 %%DATADIR%%/Help/module/FindIcotool.rst
 %%DATADIR%%/Help/module/FindImageMagick.rst
 %%DATADIR%%/Help/module/FindJNI.rst
@@ -307,6 +315,7 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/module/FindMatlab.rst
 %%DATADIR%%/Help/module/FindMotif.rst
 %%DATADIR%%/Help/module/FindOpenAL.rst
+%%DATADIR%%/Help/module/FindOpenCL.rst
 %%DATADIR%%/Help/module/FindOpenGL.rst
 %%DATADIR%%/Help/module/FindOpenMP.rst
 %%DATADIR%%/Help/module/FindOpenSSL.rst
@@ -353,6 +362,7 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/module/FindWish.rst
 %%DATADIR%%/Help/module/FindX11.rst
 %%DATADIR%%/Help/module/FindXMLRPC.rst
+%%DATADIR%%/Help/module/FindXercesC.rst
 %%DATADIR%%/Help/module/FindZLIB.rst
 %%DATADIR%%/Help/module/Findosg.rst
 %%DATADIR%%/Help/module/FindosgAnimation.rst
@@ -400,6 +410,7 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/module/Use_wxWindows.rst
 %%DATADIR%%/Help/module/UsewxWidgets.rst
 %%DATADIR%%/Help/module/WriteBasicConfigVersionFile.rst
+%%DATADIR%%/Help/module/WriteCompilerDetectionHeader.rst
 %%DATADIR%%/Help/policy/CMP0000.rst
 %%DATADIR%%/Help/policy/CMP0001.rst
 %%DATADIR%%/Help/policy/CMP0002.rst
@@ -451,6 +462,10 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/policy/CMP0048.rst
 %%DATADIR%%/Help/policy/CMP0049.rst
 %%DATADIR%%/Help/policy/CMP0050.rst
+%%DATADIR%%/Help/policy/CMP0051.rst
+%%DATADIR%%/Help/policy/CMP0052.rst
+%%DATADIR%%/Help/policy/CMP0053.rst
+%%DATADIR%%/Help/policy/CMP0054.rst
 %%DATADIR%%/Help/policy/DISALLOWED_COMMAND.txt
 %%DATADIR%%/Help/prop_cache/ADVANCED.rst
 %%DATADIR%%/Help/prop_cache/HELPSTRING.rst
@@ -486,6 +501,8 @@ share/aclocal/cmake.m4
 %%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
+%%DATADIR%%/Help/prop_gbl/CMAKE_CXX_KNOWN_FEATURES.rst
+%%DATADIR%%/Help/prop_gbl/CMAKE_C_KNOWN_FEATURES.rst
 %%DATADIR%%/Help/prop_gbl/DEBUG_CONFIGURATIONS.rst
 %%DATADIR%%/Help/prop_gbl/DISABLED_FEATURES.rst
 %%DATADIR%%/Help/prop_gbl/ECLIPSE_EXTRA_NATURES.rst
@@ -508,6 +525,9 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/prop_gbl/TARGET_ARCHIVES_MAY_BE_SHARED_LIBS.rst
 %%DATADIR%%/Help/prop_gbl/TARGET_SUPPORTS_SHARED_LIBS.rst
 %%DATADIR%%/Help/prop_gbl/USE_FOLDERS.rst
+%%DATADIR%%/Help/prop_inst/CPACK_NEVER_OVERWRITE.rst
+%%DATADIR%%/Help/prop_inst/CPACK_PERMANENT.rst
+%%DATADIR%%/Help/prop_inst/CPACK_WIX_ACL.rst
 %%DATADIR%%/Help/prop_sf/ABSTRACT.rst
 %%DATADIR%%/Help/prop_sf/AUTORCC_OPTIONS.rst
 %%DATADIR%%/Help/prop_sf/AUTOUIC_OPTIONS.rst
@@ -526,7 +546,14 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/prop_sf/OBJECT_DEPENDS.rst
 %%DATADIR%%/Help/prop_sf/OBJECT_OUTPUTS.rst
 %%DATADIR%%/Help/prop_sf/SYMBOLIC.rst
+%%DATADIR%%/Help/prop_sf/VS_DEPLOYMENT_CONTENT.rst
+%%DATADIR%%/Help/prop_sf/VS_DEPLOYMENT_LOCATION.rst
+%%DATADIR%%/Help/prop_sf/VS_SHADER_ENTRYPOINT.rst
+%%DATADIR%%/Help/prop_sf/VS_SHADER_MODEL.rst
+%%DATADIR%%/Help/prop_sf/VS_SHADER_TYPE.rst
 %%DATADIR%%/Help/prop_sf/WRAP_EXCLUDE.rst
+%%DATADIR%%/Help/prop_sf/XCODE_EXPLICIT_FILE_TYPE.rst
+%%DATADIR%%/Help/prop_sf/XCODE_LAST_KNOWN_FILE_TYPE.rst
 %%DATADIR%%/Help/prop_test/ATTACHED_FILES.rst
 %%DATADIR%%/Help/prop_test/ATTACHED_FILES_ON_FAIL.rst
 %%DATADIR%%/Help/prop_test/COST.rst
@@ -545,6 +572,8 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/prop_test/WILL_FAIL.rst
 %%DATADIR%%/Help/prop_test/WORKING_DIRECTORY.rst
 %%DATADIR%%/Help/prop_tgt/ALIASED_TARGET.rst
+%%DATADIR%%/Help/prop_tgt/ANDROID_API.rst
+%%DATADIR%%/Help/prop_tgt/ANDROID_GUI.rst
 %%DATADIR%%/Help/prop_tgt/ARCHIVE_OUTPUT_DIRECTORY.rst
 %%DATADIR%%/Help/prop_tgt/ARCHIVE_OUTPUT_DIRECTORY_CONFIG.rst
 %%DATADIR%%/Help/prop_tgt/ARCHIVE_OUTPUT_NAME.rst
@@ -565,10 +594,22 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/prop_tgt/COMPATIBLE_INTERFACE_STRING.rst
 %%DATADIR%%/Help/prop_tgt/COMPILE_DEFINITIONS.rst
 %%DATADIR%%/Help/prop_tgt/COMPILE_DEFINITIONS_CONFIG.rst
+%%DATADIR%%/Help/prop_tgt/COMPILE_FEATURES.rst
 %%DATADIR%%/Help/prop_tgt/COMPILE_FLAGS.rst
 %%DATADIR%%/Help/prop_tgt/COMPILE_OPTIONS.rst
+%%DATADIR%%/Help/prop_tgt/COMPILE_PDB_NAME.rst
+%%DATADIR%%/Help/prop_tgt/COMPILE_PDB_NAME_CONFIG.rst
+%%DATADIR%%/Help/prop_tgt/COMPILE_PDB_NOTE.txt
+%%DATADIR%%/Help/prop_tgt/COMPILE_PDB_OUTPUT_DIRECTORY.rst
+%%DATADIR%%/Help/prop_tgt/COMPILE_PDB_OUTPUT_DIRECTORY_CONFIG.rst
 %%DATADIR%%/Help/prop_tgt/CONFIG_OUTPUT_NAME.rst
 %%DATADIR%%/Help/prop_tgt/CONFIG_POSTFIX.rst
+%%DATADIR%%/Help/prop_tgt/CXX_EXTENSIONS.rst
+%%DATADIR%%/Help/prop_tgt/CXX_STANDARD.rst
+%%DATADIR%%/Help/prop_tgt/CXX_STANDARD_REQUIRED.rst
+%%DATADIR%%/Help/prop_tgt/C_EXTENSIONS.rst
+%%DATADIR%%/Help/prop_tgt/C_STANDARD.rst
+%%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/ENABLE_EXPORTS.rst
@@ -611,10 +652,12 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/prop_tgt/INSTALL_RPATH_USE_LINK_PATH.rst
 %%DATADIR%%/Help/prop_tgt/INTERFACE_AUTOUIC_OPTIONS.rst
 %%DATADIR%%/Help/prop_tgt/INTERFACE_COMPILE_DEFINITIONS.rst
+%%DATADIR%%/Help/prop_tgt/INTERFACE_COMPILE_FEATURES.rst
 %%DATADIR%%/Help/prop_tgt/INTERFACE_COMPILE_OPTIONS.rst
 %%DATADIR%%/Help/prop_tgt/INTERFACE_INCLUDE_DIRECTORIES.rst
 %%DATADIR%%/Help/prop_tgt/INTERFACE_LINK_LIBRARIES.rst
 %%DATADIR%%/Help/prop_tgt/INTERFACE_POSITION_INDEPENDENT_CODE.rst
+%%DATADIR%%/Help/prop_tgt/INTERFACE_SOURCES.rst
 %%DATADIR%%/Help/prop_tgt/INTERFACE_SYSTEM_INCLUDE_DIRECTORIES.rst
 %%DATADIR%%/Help/prop_tgt/INTERPROCEDURAL_OPTIMIZATION.rst
 %%DATADIR%%/Help/prop_tgt/INTERPROCEDURAL_OPTIMIZATION_CONFIG.rst
@@ -693,6 +736,7 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/prop_tgt/VS_SCC_LOCALPATH.rst
 %%DATADIR%%/Help/prop_tgt/VS_SCC_PROJECTNAME.rst
 %%DATADIR%%/Help/prop_tgt/VS_SCC_PROVIDER.rst
+%%DATADIR%%/Help/prop_tgt/VS_WINRT_COMPONENT.rst
 %%DATADIR%%/Help/prop_tgt/VS_WINRT_EXTENSIONS.rst
 %%DATADIR%%/Help/prop_tgt/VS_WINRT_REFERENCES.rst
 %%DATADIR%%/Help/prop_tgt/WIN32_EXECUTABLE.rst
@@ -700,12 +744,15 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/prop_tgt/XXX_OUTPUT_DIRECTORY.txt
 %%DATADIR%%/Help/prop_tgt/XXX_OUTPUT_NAME.txt
 %%DATADIR%%/Help/release/3.0.0.rst
+%%DATADIR%%/Help/release/3.1.0.rst
 %%DATADIR%%/Help/release/dev.txt
 %%DATADIR%%/Help/release/index.rst
 %%DATADIR%%/Help/variable/APPLE.rst
 %%DATADIR%%/Help/variable/BORLAND.rst
 %%DATADIR%%/Help/variable/BUILD_SHARED_LIBS.rst
 %%DATADIR%%/Help/variable/CMAKE_ABSOLUTE_DESTINATION_FILES.rst
+%%DATADIR%%/Help/variable/CMAKE_ANDROID_API.rst
+%%DATADIR%%/Help/variable/CMAKE_ANDROID_GUI.rst
 %%DATADIR%%/Help/variable/CMAKE_APPBUNDLE_PATH.rst
 %%DATADIR%%/Help/variable/CMAKE_AR.rst
 %%DATADIR%%/Help/variable/CMAKE_ARCHIVE_OUTPUT_DIRECTORY.rst
@@ -733,6 +780,8 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/variable/CMAKE_COMMAND.rst
 %%DATADIR%%/Help/variable/CMAKE_COMPILER_2005.rst
 %%DATADIR%%/Help/variable/CMAKE_COMPILER_IS_GNULANG.rst
+%%DATADIR%%/Help/variable/CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY.rst
+%%DATADIR%%/Help/variable/CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY_CONFIG.rst
 %%DATADIR%%/Help/variable/CMAKE_CONFIGURATION_TYPES.rst
 %%DATADIR%%/Help/variable/CMAKE_CONFIG_POSTFIX.rst
 %%DATADIR%%/Help/variable/CMAKE_CROSSCOMPILING.rst
@@ -742,6 +791,14 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/variable/CMAKE_CURRENT_LIST_FILE.rst
 %%DATADIR%%/Help/variable/CMAKE_CURRENT_LIST_LINE.rst
 %%DATADIR%%/Help/variable/CMAKE_CURRENT_SOURCE_DIR.rst
+%%DATADIR%%/Help/variable/CMAKE_CXX_COMPILE_FEATURES.rst
+%%DATADIR%%/Help/variable/CMAKE_CXX_EXTENSIONS.rst
+%%DATADIR%%/Help/variable/CMAKE_CXX_STANDARD.rst
+%%DATADIR%%/Help/variable/CMAKE_CXX_STANDARD_REQUIRED.rst
+%%DATADIR%%/Help/variable/CMAKE_C_COMPILE_FEATURES.rst
+%%DATADIR%%/Help/variable/CMAKE_C_EXTENSIONS.rst
+%%DATADIR%%/Help/variable/CMAKE_C_STANDARD.rst
+%%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_DISABLE_FIND_PACKAGE_PackageName.rst
@@ -752,11 +809,14 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/variable/CMAKE_EXECUTABLE_SUFFIX.rst
 %%DATADIR%%/Help/variable/CMAKE_EXE_LINKER_FLAGS.rst
 %%DATADIR%%/Help/variable/CMAKE_EXE_LINKER_FLAGS_CONFIG.rst
+%%DATADIR%%/Help/variable/CMAKE_EXPORT_NO_PACKAGE_REGISTRY.rst
 %%DATADIR%%/Help/variable/CMAKE_EXTRA_GENERATOR.rst
 %%DATADIR%%/Help/variable/CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES.rst
 %%DATADIR%%/Help/variable/CMAKE_FIND_LIBRARY_PREFIXES.rst
 %%DATADIR%%/Help/variable/CMAKE_FIND_LIBRARY_SUFFIXES.rst
 %%DATADIR%%/Help/variable/CMAKE_FIND_NO_INSTALL_PREFIX.rst
+%%DATADIR%%/Help/variable/CMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY.rst
+%%DATADIR%%/Help/variable/CMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY.rst
 %%DATADIR%%/Help/variable/CMAKE_FIND_PACKAGE_WARN_NO_MODULE.rst
 %%DATADIR%%/Help/variable/CMAKE_FIND_ROOT_PATH.rst
 %%DATADIR%%/Help/variable/CMAKE_FIND_ROOT_PATH_MODE_INCLUDE.rst
@@ -771,6 +831,7 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/variable/CMAKE_Fortran_MODOUT_FLAG.rst
 %%DATADIR%%/Help/variable/CMAKE_Fortran_MODULE_DIRECTORY.rst
 %%DATADIR%%/Help/variable/CMAKE_GENERATOR.rst
+%%DATADIR%%/Help/variable/CMAKE_GENERATOR_PLATFORM.rst
 %%DATADIR%%/Help/variable/CMAKE_GENERATOR_TOOLSET.rst
 %%DATADIR%%/Help/variable/CMAKE_GNUtoMS.rst
 %%DATADIR%%/Help/variable/CMAKE_HOME_DIRECTORY.rst
@@ -790,6 +851,7 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/variable/CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE.rst
 %%DATADIR%%/Help/variable/CMAKE_INCLUDE_PATH.rst
 %%DATADIR%%/Help/variable/CMAKE_INSTALL_DEFAULT_COMPONENT_NAME.rst
+%%DATADIR%%/Help/variable/CMAKE_INSTALL_MESSAGE.rst
 %%DATADIR%%/Help/variable/CMAKE_INSTALL_NAME_DIR.rst
 %%DATADIR%%/Help/variable/CMAKE_INSTALL_PREFIX.rst
 %%DATADIR%%/Help/variable/CMAKE_INSTALL_RPATH.rst
@@ -919,10 +981,13 @@ share/aclocal/cmake.m4
 %%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
 %%DATADIR%%/Help/variable/CMAKE_WARN_DEPRECATED.rst
 %%DATADIR%%/Help/variable/CMAKE_WARN_ON_ABSOLUTE_INSTALL_DESTINATION.rst
 %%DATADIR%%/Help/variable/CMAKE_WIN32_EXECUTABLE.rst
+%%DATADIR%%/Help/variable/CMAKE_XCODE_ATTRIBUTE_an-attribute.rst
 %%DATADIR%%/Help/variable/CMAKE_XCODE_PLATFORM_TOOLSET.rst
 %%DATADIR%%/Help/variable/CPACK_ABSOLUTE_DESTINATION_FILES.rst
 %%DATADIR%%/Help/variable/CPACK_COMPONENT_INCLUDE_TOPLEVEL_DIRECTORY.rst
@@ -932,6 +997,53 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/variable/CPACK_PACKAGING_INSTALL_PREFIX.rst
 %%DATADIR%%/Help/variable/CPACK_SET_DESTDIR.rst
 %%DATADIR%%/Help/variable/CPACK_WARN_ON_ABSOLUTE_INSTALL_DESTINATION.rst
+%%DATADIR%%/Help/variable/CTEST_BINARY_DIRECTORY.rst
+%%DATADIR%%/Help/variable/CTEST_BUILD_COMMAND.rst
+%%DATADIR%%/Help/variable/CTEST_BUILD_NAME.rst
+%%DATADIR%%/Help/variable/CTEST_BZR_COMMAND.rst
+%%DATADIR%%/Help/variable/CTEST_BZR_UPDATE_OPTIONS.rst
+%%DATADIR%%/Help/variable/CTEST_CHECKOUT_COMMAND.rst
+%%DATADIR%%/Help/variable/CTEST_CONFIGURATION_TYPE.rst
+%%DATADIR%%/Help/variable/CTEST_CONFIGURE_COMMAND.rst
+%%DATADIR%%/Help/variable/CTEST_COVERAGE_COMMAND.rst
+%%DATADIR%%/Help/variable/CTEST_COVERAGE_EXTRA_FLAGS.rst
+%%DATADIR%%/Help/variable/CTEST_CURL_OPTIONS.rst
+%%DATADIR%%/Help/variable/CTEST_CVS_CHECKOUT.rst
+%%DATADIR%%/Help/variable/CTEST_CVS_COMMAND.rst
+%%DATADIR%%/Help/variable/CTEST_CVS_UPDATE_OPTIONS.rst
+%%DATADIR%%/Help/variable/CTEST_DROP_LOCATION.rst
+%%DATADIR%%/Help/variable/CTEST_DROP_METHOD.rst
+%%DATADIR%%/Help/variable/CTEST_DROP_SITE.rst
+%%DATADIR%%/Help/variable/CTEST_DROP_SITE_CDASH.rst
+%%DATADIR%%/Help/variable/CTEST_DROP_SITE_PASSWORD.rst
+%%DATADIR%%/Help/variable/CTEST_DROP_SITE_USER.rst
+%%DATADIR%%/Help/variable/CTEST_GIT_COMMAND.rst
+%%DATADIR%%/Help/variable/CTEST_GIT_UPDATE_CUSTOM.rst
+%%DATADIR%%/Help/variable/CTEST_GIT_UPDATE_OPTIONS.rst
+%%DATADIR%%/Help/variable/CTEST_HG_COMMAND.rst
+%%DATADIR%%/Help/variable/CTEST_HG_UPDATE_OPTIONS.rst
+%%DATADIR%%/Help/variable/CTEST_MEMORYCHECK_COMMAND.rst
+%%DATADIR%%/Help/variable/CTEST_MEMORYCHECK_COMMAND_OPTIONS.rst
+%%DATADIR%%/Help/variable/CTEST_MEMORYCHECK_SANITIZER_OPTIONS.rst
+%%DATADIR%%/Help/variable/CTEST_MEMORYCHECK_SUPPRESSIONS_FILE.rst
+%%DATADIR%%/Help/variable/CTEST_MEMORYCHECK_TYPE.rst
+%%DATADIR%%/Help/variable/CTEST_NIGHTLY_START_TIME.rst
+%%DATADIR%%/Help/variable/CTEST_P4_CLIENT.rst
+%%DATADIR%%/Help/variable/CTEST_P4_COMMAND.rst
+%%DATADIR%%/Help/variable/CTEST_P4_OPTIONS.rst
+%%DATADIR%%/Help/variable/CTEST_P4_UPDATE_OPTIONS.rst
+%%DATADIR%%/Help/variable/CTEST_SCP_COMMAND.rst
+%%DATADIR%%/Help/variable/CTEST_SITE.rst
+%%DATADIR%%/Help/variable/CTEST_SOURCE_DIRECTORY.rst
+%%DATADIR%%/Help/variable/CTEST_SVN_COMMAND.rst
+%%DATADIR%%/Help/variable/CTEST_SVN_OPTIONS.rst
+%%DATADIR%%/Help/variable/CTEST_SVN_UPDATE_OPTIONS.rst
+%%DATADIR%%/Help/variable/CTEST_TEST_TIMEOUT.rst
+%%DATADIR%%/Help/variable/CTEST_TRIGGER_SITE.rst
+%%DATADIR%%/Help/variable/CTEST_UPDATE_COMMAND.rst
+%%DATADIR%%/Help/variable/CTEST_UPDATE_OPTIONS.rst
+%%DATADIR%%/Help/variable/CTEST_UPDATE_VERSION_ONLY.rst
+%%DATADIR%%/Help/variable/CTEST_USE_LAUNCHERS.rst
 %%DATADIR%%/Help/variable/CYGWIN.rst
 %%DATADIR%%/Help/variable/ENV.rst
 %%DATADIR%%/Help/variable/EXECUTABLE_OUTPUT_PATH.rst
@@ -940,6 +1052,7 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/variable/MSVC10.rst
 %%DATADIR%%/Help/variable/MSVC11.rst
 %%DATADIR%%/Help/variable/MSVC12.rst
+%%DATADIR%%/Help/variable/MSVC14.rst
 %%DATADIR%%/Help/variable/MSVC60.rst
 %%DATADIR%%/Help/variable/MSVC70.rst
 %%DATADIR%%/Help/variable/MSVC71.rst
@@ -964,6 +1077,9 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/variable/PROJECT_VERSION_TWEAK.rst
 %%DATADIR%%/Help/variable/UNIX.rst
 %%DATADIR%%/Help/variable/WIN32.rst
+%%DATADIR%%/Help/variable/WINCE.rst
+%%DATADIR%%/Help/variable/WINDOWS_PHONE.rst
+%%DATADIR%%/Help/variable/WINDOWS_STORE.rst
 %%DATADIR%%/Help/variable/XCODE_VERSION.rst
 %%DATADIR%%/completions/cmake
 %%DATADIR%%/completions/cpack