Changes 3.1.0:

* Windows Phone and Windows Store support has been added to  Visual Studio 11
  (2012) and above Generators.
* NVIDIA Nsight Tegra support has been added to  Visual Studio 10 (2010) and
  above Generators.
* New "target_compile_features" command allows populating target based compile
  features. CMake uses this information to ensure that the compiler in use is
  capable of building the target, and to add any necessary compile flags
  such as -std=gnu++11 to support language features.
  More information on this is found at:
  - http://www.cmake.org/cmake/help/v3.1/manual/cmake-compile-features.7.html
* The syntax for *Variable References* and *Escape Sequences* was simplified in
  order to allow a much faster implementation. See policy "CMP0053".
* The "if" command no longer automatically dereferences variables named in
  quoted or bracket arguments.  See policy "CMP0054".
* The target property "SOURCES" now generally supports "Generator Expressions".
  The generator expressions may be used in the "add_library" and
  "add_executable" commands.
* It is now possible to write and append to the target property "SOURCES".
  The variable "CMAKE_DEBUG_TARGET_PROPERTIES" can be used to trace the
  origin of sources.
* CPack gained "7Z" and "TXZ" generators supporting lzma-compressed archives.
* The ExternalProject module has learned to support lzma-compressed
  source tarballs with ".7z", ".tar.xz", and ".txz" extensions.
* The ExternalProject module ExternalProject_Add command learned a new
  BUILD_ALWAYS option to cause the external project build step to run every
  time the host project is built.
* The ctest_coverage command learned to support Intel coverage files with the
  "codecov" tool.
* The ctest_memcheck command learned to support sanitizer modes, including
  "AddressSanitizer", "MemorySanitizer", "ThreadSanitizer", and
  "UndefinedBehaviorSanitizer".

8 files changed, 243 insertions, 61 deletions

diff --git a/devel/cmake/Makefile b/devel/cmake/Makefile
index 277651e565c..8ca8fb039b7 100644
--- a/devel/cmake/Makefile
+++ b/devel/cmake/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.90 2014/10/01 07:33:24 adam Exp $
+# $NetBSD: Makefile,v 1.91 2015/01/17 13:29:55 adam Exp $
 
-DISTNAME=	cmake-${CMAKE_API}.2
+DISTNAME=	cmake-${CMAKE_API}.0
 CATEGORIES=	devel
 MASTER_SITES=	http://www.cmake.org/files/v${CMAKE_API}/
 
-CMAKE_API=	3.0
+CMAKE_API=	3.1
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.cmake.org/
diff --git a/devel/cmake/PLIST b/devel/cmake/PLIST
index ce512e019bb..26b1d5b3d08 100644
--- a/devel/cmake/PLIST
+++ b/devel/cmake/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.34 2014/08/10 10:02:51 adam Exp $
+@comment $NetBSD: PLIST,v 1.35 2015/01/17 13:29:55 adam Exp $
 bin/ccmake
 bin/cmake
 bin/cpack
@@ -109,9 +109,11 @@ share/cmake-${CMAKE_API}/Help/command/string.rst
 share/cmake-${CMAKE_API}/Help/command/subdir_depends.rst
 share/cmake-${CMAKE_API}/Help/command/subdirs.rst
 share/cmake-${CMAKE_API}/Help/command/target_compile_definitions.rst
+share/cmake-${CMAKE_API}/Help/command/target_compile_features.rst
 share/cmake-${CMAKE_API}/Help/command/target_compile_options.rst
 share/cmake-${CMAKE_API}/Help/command/target_include_directories.rst
 share/cmake-${CMAKE_API}/Help/command/target_link_libraries.rst
+share/cmake-${CMAKE_API}/Help/command/target_sources.rst
 share/cmake-${CMAKE_API}/Help/command/try_compile.rst
 share/cmake-${CMAKE_API}/Help/command/try_run.rst
 share/cmake-${CMAKE_API}/Help/command/unset.rst
@@ -137,6 +139,7 @@ share/cmake-${CMAKE_API}/Help/generator/Unix Makefiles.rst
 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 6.rst
 share/cmake-${CMAKE_API}/Help/generator/Visual Studio 7 .NET 2003.rst
 share/cmake-${CMAKE_API}/Help/generator/Visual Studio 7.rst
@@ -152,6 +155,7 @@ share/cmake-${CMAKE_API}/Help/manual/OPTIONS_HELP.txt
 share/cmake-${CMAKE_API}/Help/manual/ccmake.1.rst
 share/cmake-${CMAKE_API}/Help/manual/cmake-buildsystem.7.rst
 share/cmake-${CMAKE_API}/Help/manual/cmake-commands.7.rst
+share/cmake-${CMAKE_API}/Help/manual/cmake-compile-features.7.rst
 share/cmake-${CMAKE_API}/Help/manual/cmake-developer.7.rst
 share/cmake-${CMAKE_API}/Help/manual/cmake-generator-expressions.7.rst
 share/cmake-${CMAKE_API}/Help/manual/cmake-generators.7.rst
@@ -191,6 +195,7 @@ share/cmake-${CMAKE_API}/Help/module/CPackComponent.rst
 share/cmake-${CMAKE_API}/Help/module/CPackCygwin.rst
 share/cmake-${CMAKE_API}/Help/module/CPackDMG.rst
 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/CPackRPM.rst
@@ -206,6 +211,7 @@ share/cmake-${CMAKE_API}/Help/module/CheckCXXSourceCompiles.rst
 share/cmake-${CMAKE_API}/Help/module/CheckCXXSourceRuns.rst
 share/cmake-${CMAKE_API}/Help/module/CheckCXXSymbolExists.rst
 share/cmake-${CMAKE_API}/Help/module/CheckFortranFunctionExists.rst
+share/cmake-${CMAKE_API}/Help/module/CheckFortranSourceCompiles.rst
 share/cmake-${CMAKE_API}/Help/module/CheckFunctionExists.rst
 share/cmake-${CMAKE_API}/Help/module/CheckIncludeFile.rst
 share/cmake-${CMAKE_API}/Help/module/CheckIncludeFileCXX.rst
@@ -268,6 +274,7 @@ 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/FindITK.rst
+share/cmake-${CMAKE_API}/Help/module/FindIce.rst
 share/cmake-${CMAKE_API}/Help/module/FindIcotool.rst
 share/cmake-${CMAKE_API}/Help/module/FindImageMagick.rst
 share/cmake-${CMAKE_API}/Help/module/FindJNI.rst
@@ -292,6 +299,7 @@ share/cmake-${CMAKE_API}/Help/module/FindMPI.rst
 share/cmake-${CMAKE_API}/Help/module/FindMatlab.rst
 share/cmake-${CMAKE_API}/Help/module/FindMotif.rst
 share/cmake-${CMAKE_API}/Help/module/FindOpenAL.rst
+share/cmake-${CMAKE_API}/Help/module/FindOpenCL.rst
 share/cmake-${CMAKE_API}/Help/module/FindOpenGL.rst
 share/cmake-${CMAKE_API}/Help/module/FindOpenMP.rst
 share/cmake-${CMAKE_API}/Help/module/FindOpenSSL.rst
@@ -338,6 +346,7 @@ share/cmake-${CMAKE_API}/Help/module/FindWget.rst
 share/cmake-${CMAKE_API}/Help/module/FindWish.rst
 share/cmake-${CMAKE_API}/Help/module/FindX11.rst
 share/cmake-${CMAKE_API}/Help/module/FindXMLRPC.rst
+share/cmake-${CMAKE_API}/Help/module/FindXercesC.rst
 share/cmake-${CMAKE_API}/Help/module/FindZLIB.rst
 share/cmake-${CMAKE_API}/Help/module/Findosg.rst
 share/cmake-${CMAKE_API}/Help/module/FindosgAnimation.rst
@@ -385,6 +394,7 @@ share/cmake-${CMAKE_API}/Help/module/UseSWIG.rst
 share/cmake-${CMAKE_API}/Help/module/Use_wxWindows.rst
 share/cmake-${CMAKE_API}/Help/module/UsewxWidgets.rst
 share/cmake-${CMAKE_API}/Help/module/WriteBasicConfigVersionFile.rst
+share/cmake-${CMAKE_API}/Help/module/WriteCompilerDetectionHeader.rst
 share/cmake-${CMAKE_API}/Help/policy/CMP0000.rst
 share/cmake-${CMAKE_API}/Help/policy/CMP0001.rst
 share/cmake-${CMAKE_API}/Help/policy/CMP0002.rst
@@ -436,6 +446,10 @@ share/cmake-${CMAKE_API}/Help/policy/CMP0047.rst
 share/cmake-${CMAKE_API}/Help/policy/CMP0048.rst
 share/cmake-${CMAKE_API}/Help/policy/CMP0049.rst
 share/cmake-${CMAKE_API}/Help/policy/CMP0050.rst
+share/cmake-${CMAKE_API}/Help/policy/CMP0051.rst
+share/cmake-${CMAKE_API}/Help/policy/CMP0052.rst
+share/cmake-${CMAKE_API}/Help/policy/CMP0053.rst
+share/cmake-${CMAKE_API}/Help/policy/CMP0054.rst
 share/cmake-${CMAKE_API}/Help/policy/DISALLOWED_COMMAND.txt
 share/cmake-${CMAKE_API}/Help/prop_cache/ADVANCED.rst
 share/cmake-${CMAKE_API}/Help/prop_cache/HELPSTRING.rst
@@ -471,6 +485,8 @@ share/cmake-${CMAKE_API}/Help/prop_dir/VS_GLOBAL_SECTION_PRE_section.rst
 share/cmake-${CMAKE_API}/Help/prop_gbl/ALLOW_DUPLICATE_CUSTOM_TARGETS.rst
 share/cmake-${CMAKE_API}/Help/prop_gbl/AUTOGEN_TARGETS_FOLDER.rst
 share/cmake-${CMAKE_API}/Help/prop_gbl/AUTOMOC_TARGETS_FOLDER.rst
+share/cmake-${CMAKE_API}/Help/prop_gbl/CMAKE_CXX_KNOWN_FEATURES.rst
+share/cmake-${CMAKE_API}/Help/prop_gbl/CMAKE_C_KNOWN_FEATURES.rst
 share/cmake-${CMAKE_API}/Help/prop_gbl/DEBUG_CONFIGURATIONS.rst
 share/cmake-${CMAKE_API}/Help/prop_gbl/DISABLED_FEATURES.rst
 share/cmake-${CMAKE_API}/Help/prop_gbl/ECLIPSE_EXTRA_NATURES.rst
@@ -493,6 +509,9 @@ share/cmake-${CMAKE_API}/Help/prop_gbl/RULE_MESSAGES.rst
 share/cmake-${CMAKE_API}/Help/prop_gbl/TARGET_ARCHIVES_MAY_BE_SHARED_LIBS.rst
 share/cmake-${CMAKE_API}/Help/prop_gbl/TARGET_SUPPORTS_SHARED_LIBS.rst
 share/cmake-${CMAKE_API}/Help/prop_gbl/USE_FOLDERS.rst
+share/cmake-${CMAKE_API}/Help/prop_inst/CPACK_NEVER_OVERWRITE.rst
+share/cmake-${CMAKE_API}/Help/prop_inst/CPACK_PERMANENT.rst
+share/cmake-${CMAKE_API}/Help/prop_inst/CPACK_WIX_ACL.rst
 share/cmake-${CMAKE_API}/Help/prop_sf/ABSTRACT.rst
 share/cmake-${CMAKE_API}/Help/prop_sf/AUTORCC_OPTIONS.rst
 share/cmake-${CMAKE_API}/Help/prop_sf/AUTOUIC_OPTIONS.rst
@@ -511,7 +530,14 @@ share/cmake-${CMAKE_API}/Help/prop_sf/MACOSX_PACKAGE_LOCATION.rst
 share/cmake-${CMAKE_API}/Help/prop_sf/OBJECT_DEPENDS.rst
 share/cmake-${CMAKE_API}/Help/prop_sf/OBJECT_OUTPUTS.rst
 share/cmake-${CMAKE_API}/Help/prop_sf/SYMBOLIC.rst
+share/cmake-${CMAKE_API}/Help/prop_sf/VS_DEPLOYMENT_CONTENT.rst
+share/cmake-${CMAKE_API}/Help/prop_sf/VS_DEPLOYMENT_LOCATION.rst
+share/cmake-${CMAKE_API}/Help/prop_sf/VS_SHADER_ENTRYPOINT.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/WRAP_EXCLUDE.rst
+share/cmake-${CMAKE_API}/Help/prop_sf/XCODE_EXPLICIT_FILE_TYPE.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
 share/cmake-${CMAKE_API}/Help/prop_test/COST.rst
@@ -530,6 +556,8 @@ share/cmake-${CMAKE_API}/Help/prop_test/TIMEOUT.rst
 share/cmake-${CMAKE_API}/Help/prop_test/WILL_FAIL.rst
 share/cmake-${CMAKE_API}/Help/prop_test/WORKING_DIRECTORY.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/ALIASED_TARGET.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/ANDROID_API.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/ANDROID_GUI.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/ARCHIVE_OUTPUT_DIRECTORY.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/ARCHIVE_OUTPUT_DIRECTORY_CONFIG.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/ARCHIVE_OUTPUT_NAME.rst
@@ -550,10 +578,22 @@ share/cmake-${CMAKE_API}/Help/prop_tgt/COMPATIBLE_INTERFACE_NUMBER_MIN.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/COMPATIBLE_INTERFACE_STRING.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/COMPILE_DEFINITIONS.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/COMPILE_DEFINITIONS_CONFIG.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/COMPILE_FEATURES.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/COMPILE_FLAGS.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/COMPILE_OPTIONS.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/COMPILE_PDB_NAME.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/COMPILE_PDB_NAME_CONFIG.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/COMPILE_PDB_NOTE.txt
+share/cmake-${CMAKE_API}/Help/prop_tgt/COMPILE_PDB_OUTPUT_DIRECTORY.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/COMPILE_PDB_OUTPUT_DIRECTORY_CONFIG.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/CONFIG_OUTPUT_NAME.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/CONFIG_POSTFIX.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/CXX_EXTENSIONS.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/CXX_STANDARD.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/CXX_STANDARD_REQUIRED.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/C_EXTENSIONS.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/C_STANDARD.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/C_STANDARD_REQUIRED.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/DEBUG_POSTFIX.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/DEFINE_SYMBOL.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/ENABLE_EXPORTS.rst
@@ -596,10 +636,12 @@ share/cmake-${CMAKE_API}/Help/prop_tgt/INSTALL_RPATH.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/INSTALL_RPATH_USE_LINK_PATH.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/INTERFACE_AUTOUIC_OPTIONS.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/INTERFACE_COMPILE_DEFINITIONS.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/INTERFACE_COMPILE_FEATURES.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/INTERFACE_COMPILE_OPTIONS.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/INTERFACE_INCLUDE_DIRECTORIES.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/INTERFACE_LINK_LIBRARIES.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/INTERFACE_POSITION_INDEPENDENT_CODE.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/INTERFACE_SOURCES.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/INTERFACE_SYSTEM_INCLUDE_DIRECTORIES.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/INTERPROCEDURAL_OPTIMIZATION.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/INTERPROCEDURAL_OPTIMIZATION_CONFIG.rst
@@ -678,6 +720,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_WINRT_COMPONENT.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/VS_WINRT_EXTENSIONS.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/VS_WINRT_REFERENCES.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/WIN32_EXECUTABLE.rst
@@ -685,12 +728,15 @@ share/cmake-${CMAKE_API}/Help/prop_tgt/XCODE_ATTRIBUTE_an-attribute.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/XXX_OUTPUT_DIRECTORY.txt
 share/cmake-${CMAKE_API}/Help/prop_tgt/XXX_OUTPUT_NAME.txt
 share/cmake-${CMAKE_API}/Help/release/3.0.0.rst
+share/cmake-${CMAKE_API}/Help/release/3.1.0.rst
 share/cmake-${CMAKE_API}/Help/release/dev.txt
 share/cmake-${CMAKE_API}/Help/release/index.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
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_ABSOLUTE_DESTINATION_FILES.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_ANDROID_API.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_ANDROID_GUI.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_APPBUNDLE_PATH.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_AR.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_ARCHIVE_OUTPUT_DIRECTORY.rst
@@ -718,6 +764,8 @@ 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_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
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_CONFIG_POSTFIX.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_CROSSCOMPILING.rst
@@ -727,6 +775,14 @@ share/cmake-${CMAKE_API}/Help/variable/CMAKE_CURRENT_LIST_DIR.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_CURRENT_LIST_FILE.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_CURRENT_LIST_LINE.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_CURRENT_SOURCE_DIR.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_CXX_COMPILE_FEATURES.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_CXX_EXTENSIONS.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_CXX_STANDARD.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_CXX_STANDARD_REQUIRED.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_C_COMPILE_FEATURES.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_C_EXTENSIONS.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_C_STANDARD.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_C_STANDARD_REQUIRED.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_DEBUG_POSTFIX.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_DEBUG_TARGET_PROPERTIES.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_DISABLE_FIND_PACKAGE_PackageName.rst
@@ -737,11 +793,14 @@ 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_EXPORT_NO_PACKAGE_REGISTRY.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_EXTRA_GENERATOR.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_FIND_LIBRARY_PREFIXES.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_FIND_LIBRARY_SUFFIXES.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_FIND_NO_INSTALL_PREFIX.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_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
@@ -756,6 +815,7 @@ share/cmake-${CMAKE_API}/Help/variable/CMAKE_Fortran_MODDIR_FLAG.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_Fortran_MODOUT_FLAG.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_Fortran_MODULE_DIRECTORY.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_GENERATOR.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_GENERATOR_PLATFORM.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_GENERATOR_TOOLSET.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_GNUtoMS.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_HOME_DIRECTORY.rst
@@ -775,6 +835,7 @@ share/cmake-${CMAKE_API}/Help/variable/CMAKE_INCLUDE_DIRECTORIES_BEFORE.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_INCLUDE_PATH.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_INSTALL_DEFAULT_COMPONENT_NAME.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_INSTALL_MESSAGE.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_INSTALL_NAME_DIR.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_INSTALL_PREFIX.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_INSTALL_RPATH.rst
@@ -904,10 +965,13 @@ share/cmake-${CMAKE_API}/Help/variable/CMAKE_VS_DEVENV_COMMAND.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_VS_INTEL_Fortran_PROJECT_VERSION.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_VS_MSBUILD_COMMAND.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_VS_MSDEV_COMMAND.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_VS_NsightTegra_VERSION.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_VS_PLATFORM_NAME.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_VS_PLATFORM_TOOLSET.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_WARN_DEPRECATED.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_WARN_ON_ABSOLUTE_INSTALL_DESTINATION.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_WIN32_EXECUTABLE.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_XCODE_ATTRIBUTE_an-attribute.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_XCODE_PLATFORM_TOOLSET.rst
 share/cmake-${CMAKE_API}/Help/variable/CPACK_ABSOLUTE_DESTINATION_FILES.rst
 share/cmake-${CMAKE_API}/Help/variable/CPACK_COMPONENT_INCLUDE_TOPLEVEL_DIRECTORY.rst
@@ -917,6 +981,53 @@ share/cmake-${CMAKE_API}/Help/variable/CPACK_INSTALL_SCRIPT.rst
 share/cmake-${CMAKE_API}/Help/variable/CPACK_PACKAGING_INSTALL_PREFIX.rst
 share/cmake-${CMAKE_API}/Help/variable/CPACK_SET_DESTDIR.rst
 share/cmake-${CMAKE_API}/Help/variable/CPACK_WARN_ON_ABSOLUTE_INSTALL_DESTINATION.rst
+share/cmake-${CMAKE_API}/Help/variable/CTEST_BINARY_DIRECTORY.rst
+share/cmake-${CMAKE_API}/Help/variable/CTEST_BUILD_COMMAND.rst
+share/cmake-${CMAKE_API}/Help/variable/CTEST_BUILD_NAME.rst
+share/cmake-${CMAKE_API}/Help/variable/CTEST_BZR_COMMAND.rst
+share/cmake-${CMAKE_API}/Help/variable/CTEST_BZR_UPDATE_OPTIONS.rst
+share/cmake-${CMAKE_API}/Help/variable/CTEST_CHECKOUT_COMMAND.rst
+share/cmake-${CMAKE_API}/Help/variable/CTEST_CONFIGURATION_TYPE.rst
+share/cmake-${CMAKE_API}/Help/variable/CTEST_CONFIGURE_COMMAND.rst
+share/cmake-${CMAKE_API}/Help/variable/CTEST_COVERAGE_COMMAND.rst
+share/cmake-${CMAKE_API}/Help/variable/CTEST_COVERAGE_EXTRA_FLAGS.rst
+share/cmake-${CMAKE_API}/Help/variable/CTEST_CURL_OPTIONS.rst
+share/cmake-${CMAKE_API}/Help/variable/CTEST_CVS_CHECKOUT.rst
+share/cmake-${CMAKE_API}/Help/variable/CTEST_CVS_COMMAND.rst
+share/cmake-${CMAKE_API}/Help/variable/CTEST_CVS_UPDATE_OPTIONS.rst
+share/cmake-${CMAKE_API}/Help/variable/CTEST_DROP_LOCATION.rst
+share/cmake-${CMAKE_API}/Help/variable/CTEST_DROP_METHOD.rst
+share/cmake-${CMAKE_API}/Help/variable/CTEST_DROP_SITE.rst
+share/cmake-${CMAKE_API}/Help/variable/CTEST_DROP_SITE_CDASH.rst
+share/cmake-${CMAKE_API}/Help/variable/CTEST_DROP_SITE_PASSWORD.rst
+share/cmake-${CMAKE_API}/Help/variable/CTEST_DROP_SITE_USER.rst
+share/cmake-${CMAKE_API}/Help/variable/CTEST_GIT_COMMAND.rst
+share/cmake-${CMAKE_API}/Help/variable/CTEST_GIT_UPDATE_CUSTOM.rst
+share/cmake-${CMAKE_API}/Help/variable/CTEST_GIT_UPDATE_OPTIONS.rst
+share/cmake-${CMAKE_API}/Help/variable/CTEST_HG_COMMAND.rst
+share/cmake-${CMAKE_API}/Help/variable/CTEST_HG_UPDATE_OPTIONS.rst
+share/cmake-${CMAKE_API}/Help/variable/CTEST_MEMORYCHECK_COMMAND.rst
+share/cmake-${CMAKE_API}/Help/variable/CTEST_MEMORYCHECK_COMMAND_OPTIONS.rst
+share/cmake-${CMAKE_API}/Help/variable/CTEST_MEMORYCHECK_SANITIZER_OPTIONS.rst
+share/cmake-${CMAKE_API}/Help/variable/CTEST_MEMORYCHECK_SUPPRESSIONS_FILE.rst
+share/cmake-${CMAKE_API}/Help/variable/CTEST_MEMORYCHECK_TYPE.rst
+share/cmake-${CMAKE_API}/Help/variable/CTEST_NIGHTLY_START_TIME.rst
+share/cmake-${CMAKE_API}/Help/variable/CTEST_P4_CLIENT.rst
+share/cmake-${CMAKE_API}/Help/variable/CTEST_P4_COMMAND.rst
+share/cmake-${CMAKE_API}/Help/variable/CTEST_P4_OPTIONS.rst
+share/cmake-${CMAKE_API}/Help/variable/CTEST_P4_UPDATE_OPTIONS.rst
+share/cmake-${CMAKE_API}/Help/variable/CTEST_SCP_COMMAND.rst
+share/cmake-${CMAKE_API}/Help/variable/CTEST_SITE.rst
+share/cmake-${CMAKE_API}/Help/variable/CTEST_SOURCE_DIRECTORY.rst
+share/cmake-${CMAKE_API}/Help/variable/CTEST_SVN_COMMAND.rst
+share/cmake-${CMAKE_API}/Help/variable/CTEST_SVN_OPTIONS.rst
+share/cmake-${CMAKE_API}/Help/variable/CTEST_SVN_UPDATE_OPTIONS.rst
+share/cmake-${CMAKE_API}/Help/variable/CTEST_TEST_TIMEOUT.rst
+share/cmake-${CMAKE_API}/Help/variable/CTEST_TRIGGER_SITE.rst
+share/cmake-${CMAKE_API}/Help/variable/CTEST_UPDATE_COMMAND.rst
+share/cmake-${CMAKE_API}/Help/variable/CTEST_UPDATE_OPTIONS.rst
+share/cmake-${CMAKE_API}/Help/variable/CTEST_UPDATE_VERSION_ONLY.rst
+share/cmake-${CMAKE_API}/Help/variable/CTEST_USE_LAUNCHERS.rst
 share/cmake-${CMAKE_API}/Help/variable/CYGWIN.rst
 share/cmake-${CMAKE_API}/Help/variable/ENV.rst
 share/cmake-${CMAKE_API}/Help/variable/EXECUTABLE_OUTPUT_PATH.rst
@@ -925,6 +1036,7 @@ share/cmake-${CMAKE_API}/Help/variable/MSVC.rst
 share/cmake-${CMAKE_API}/Help/variable/MSVC10.rst
 share/cmake-${CMAKE_API}/Help/variable/MSVC11.rst
 share/cmake-${CMAKE_API}/Help/variable/MSVC12.rst
+share/cmake-${CMAKE_API}/Help/variable/MSVC14.rst
 share/cmake-${CMAKE_API}/Help/variable/MSVC60.rst
 share/cmake-${CMAKE_API}/Help/variable/MSVC70.rst
 share/cmake-${CMAKE_API}/Help/variable/MSVC71.rst
@@ -949,6 +1061,9 @@ share/cmake-${CMAKE_API}/Help/variable/PROJECT_VERSION_PATCH.rst
 share/cmake-${CMAKE_API}/Help/variable/PROJECT_VERSION_TWEAK.rst
 share/cmake-${CMAKE_API}/Help/variable/UNIX.rst
 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_VERSION.rst
 share/cmake-${CMAKE_API}/Modules/.NoDartCoverage
 share/cmake-${CMAKE_API}/Modules/AddFileDependencies.cmake
@@ -983,6 +1098,7 @@ share/cmake-${CMAKE_API}/Modules/CMakeCheckCompilerFlagCommonPatterns.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeClDeps.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeCommonLanguageInclude.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeCompilerABI.h
+share/cmake-${CMAKE_API}/Modules/CMakeCompilerIdDetection.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeConfigurableFile.in
 share/cmake-${CMAKE_API}/Modules/CMakeDependentOption.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeDetermineASM-ATTCompiler.cmake
@@ -991,6 +1107,7 @@ share/cmake-${CMAKE_API}/Modules/CMakeDetermineASM_MASMCompiler.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeDetermineASM_NASMCompiler.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeDetermineCCompiler.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeDetermineCXXCompiler.cmake
+share/cmake-${CMAKE_API}/Modules/CMakeDetermineCompileFeatures.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeDetermineCompiler.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeDetermineCompilerABI.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeDetermineCompilerId.cmake
@@ -1039,6 +1156,7 @@ share/cmake-${CMAKE_API}/Modules/CMakeRCCompiler.cmake.in
 share/cmake-${CMAKE_API}/Modules/CMakeRCInformation.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeSystem.cmake.in
 share/cmake-${CMAKE_API}/Modules/CMakeSystemSpecificInformation.cmake
+share/cmake-${CMAKE_API}/Modules/CMakeSystemSpecificInitialize.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeTestASM-ATTCompiler.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeTestASMCompiler.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeTestASM_MASMCompiler.cmake
@@ -1073,6 +1191,7 @@ share/cmake-${CMAKE_API}/Modules/CPackComponent.cmake
 share/cmake-${CMAKE_API}/Modules/CPackCygwin.cmake
 share/cmake-${CMAKE_API}/Modules/CPackDMG.cmake
 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/CPackRPM.cmake
@@ -1091,6 +1210,7 @@ share/cmake-${CMAKE_API}/Modules/CheckCXXSourceRuns.cmake
 share/cmake-${CMAKE_API}/Modules/CheckCXXSymbolExists.cmake
 share/cmake-${CMAKE_API}/Modules/CheckForPthreads.c
 share/cmake-${CMAKE_API}/Modules/CheckFortranFunctionExists.cmake
+share/cmake-${CMAKE_API}/Modules/CheckFortranSourceCompiles.cmake
 share/cmake-${CMAKE_API}/Modules/CheckFunctionExists.c
 share/cmake-${CMAKE_API}/Modules/CheckFunctionExists.cmake
 share/cmake-${CMAKE_API}/Modules/CheckIncludeFile.c.in
@@ -1111,45 +1231,72 @@ share/cmake-${CMAKE_API}/Modules/CheckTypeSize.cmake
 share/cmake-${CMAKE_API}/Modules/CheckTypeSizeMap.cmake.in
 share/cmake-${CMAKE_API}/Modules/CheckVariableExists.c
 share/cmake-${CMAKE_API}/Modules/CheckVariableExists.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/ADSP-DetermineCompiler.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/Absoft-Fortran.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/AppleClang-ASM.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/AppleClang-C.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/AppleClang-CXX.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/AppleClang-DetermineCompiler.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/Borland-DetermineCompiler.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/Clang-ASM.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/Clang-C-FeatureTests.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/Clang-C.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/Clang-CXX-FeatureTests.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/Clang-CXX.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/Clang-DetermineCompiler.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/Clang-DetermineCompilerInternal.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/Clang.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/Comeau-CXX-DetermineCompiler.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/Compaq-C-DetermineCompiler.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/Compaq-CXX-DetermineCompiler.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/Cray-C.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/Cray-CXX.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/Cray-DetermineCompiler.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/Cray-Fortran.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/Embarcadero-DetermineCompiler.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/Fujitsu-DetermineCompiler.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/G95-Fortran.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/GNU-ASM.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/GNU-C-FeatureTests.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/GNU-C.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/GNU-CXX-FeatureTests.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/GNU-CXX.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/GNU-DetermineCompiler.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/GNU-Fortran.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/GNU.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/HP-ASM.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/HP-C-DetermineCompiler.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/HP-C.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/HP-CXX-DetermineCompiler.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/HP-CXX.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/HP-Fortran.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/IAR-ASM.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/IAR-C.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/IAR-CXX.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/IAR-DetermineCompiler.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/IAR.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/IBMCPP-C-DetermineVersionInternal.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/IBMCPP-CXX-DetermineVersionInternal.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/Intel-ASM.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/Intel-C.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/MIPSpro-C.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/MIPSpro-CXX.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/MIPSpro-DetermineCompiler.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/MIPSpro-Fortran.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/MSVC-DetermineCompiler.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/NAG-Fortran.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/OpenWatcom-DetermineCompiler.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/PGI-C.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/PGI-CXX.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/PGI-DetermineCompiler.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/PGI-Fortran.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/PGI.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/PathScale-C.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/PathScale-CXX.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/PathScale-DetermineCompiler.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/PathScale-Fortran.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/PathScale.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/QCC-C.cmake
@@ -1157,27 +1304,41 @@ share/cmake-${CMAKE_API}/Modules/Compiler/QCC-CXX.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/QCC.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/SCO-C.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/SCO-CXX.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/SCO-DetermineCompiler.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/SCO.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/SDCC-C-DetermineCompiler.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/SunPro-ASM.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/SunPro-C-DetermineCompiler.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/SunPro-C.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/SunPro-CXX-DetermineCompiler.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/SunPro-CXX.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/SunPro-Fortran.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/TI-ASM.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/TI-C.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/TI-CXX.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/TI-DetermineCompiler.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/TinyCC-C-DetermineCompiler.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/TinyCC-C.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/VisualAge-C-DetermineCompiler.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/VisualAge-C.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/VisualAge-CXX-DetermineCompiler.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/VisualAge-CXX.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/VisualAge-Fortran.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/Watcom-DetermineCompiler.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/XL-ASM.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/XL-C-DetermineCompiler.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/XL-C.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/XL-CXX-DetermineCompiler.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/XL-CXX.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/XL-Fortran.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/XL.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/zOS-C-DetermineCompiler.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/zOS-CXX-DetermineCompiler.cmake
 share/cmake-${CMAKE_API}/Modules/CompilerId/VS-10.vcxproj.in
 share/cmake-${CMAKE_API}/Modules/CompilerId/VS-6.dsp.in
 share/cmake-${CMAKE_API}/Modules/CompilerId/VS-7.vcproj.in
 share/cmake-${CMAKE_API}/Modules/CompilerId/VS-Intel.vfproj.in
+share/cmake-${CMAKE_API}/Modules/CompilerId/VS-NsightTegra.vcxproj.in
 share/cmake-${CMAKE_API}/Modules/CompilerId/Xcode-1.pbxproj.in
 share/cmake-${CMAKE_API}/Modules/CompilerId/Xcode-2.pbxproj.in
 share/cmake-${CMAKE_API}/Modules/CompilerId/Xcode-3.pbxproj.in
@@ -1239,7 +1400,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/FindITK.cmake
+share/cmake-${CMAKE_API}/Modules/FindIce.cmake
 share/cmake-${CMAKE_API}/Modules/FindIcotool.cmake
 share/cmake-${CMAKE_API}/Modules/FindImageMagick.cmake
 share/cmake-${CMAKE_API}/Modules/FindJNI.cmake
@@ -1264,6 +1425,7 @@ share/cmake-${CMAKE_API}/Modules/FindMPI.cmake
 share/cmake-${CMAKE_API}/Modules/FindMatlab.cmake
 share/cmake-${CMAKE_API}/Modules/FindMotif.cmake
 share/cmake-${CMAKE_API}/Modules/FindOpenAL.cmake
+share/cmake-${CMAKE_API}/Modules/FindOpenCL.cmake
 share/cmake-${CMAKE_API}/Modules/FindOpenGL.cmake
 share/cmake-${CMAKE_API}/Modules/FindOpenMP.cmake
 share/cmake-${CMAKE_API}/Modules/FindOpenSSL.cmake
@@ -1305,11 +1467,11 @@ 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/FindVTK.cmake
 share/cmake-${CMAKE_API}/Modules/FindWget.cmake
 share/cmake-${CMAKE_API}/Modules/FindWish.cmake
 share/cmake-${CMAKE_API}/Modules/FindX11.cmake
 share/cmake-${CMAKE_API}/Modules/FindXMLRPC.cmake
+share/cmake-${CMAKE_API}/Modules/FindXercesC.cmake
 share/cmake-${CMAKE_API}/Modules/FindZLIB.cmake
 share/cmake-${CMAKE_API}/Modules/Findosg.cmake
 share/cmake-${CMAKE_API}/Modules/FindosgAnimation.cmake
@@ -1362,6 +1524,7 @@ share/cmake-${CMAKE_API}/Modules/InstallRequiredSystemLibraries.cmake
 share/cmake-${CMAKE_API}/Modules/IntelVSImplicitPath/CMakeLists.txt
 share/cmake-${CMAKE_API}/Modules/IntelVSImplicitPath/detect.cmake
 share/cmake-${CMAKE_API}/Modules/IntelVSImplicitPath/hello.f
+share/cmake-${CMAKE_API}/Modules/Internal/FeatureTesting.cmake
 share/cmake-${CMAKE_API}/Modules/KDE3Macros.cmake
 share/cmake-${CMAKE_API}/Modules/MacOSXBundleInfo.plist.in
 share/cmake-${CMAKE_API}/Modules/MacOSXFrameworkInfo.plist.in
@@ -1382,6 +1545,7 @@ share/cmake-${CMAKE_API}/Modules/Platform/AIX-XL-CXX.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/AIX-XL-Fortran.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/AIX-XL.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/AIX.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Android.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
@@ -1419,6 +1583,7 @@ 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
 share/cmake-${CMAKE_API}/Modules/Platform/Darwin-GNU.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Darwin-Initialize.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Darwin-Intel-C.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Darwin-Intel-CXX.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Darwin-Intel-Fortran.cmake
@@ -1536,9 +1701,14 @@ 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
 share/cmake-${CMAKE_API}/Modules/Platform/WindowsCE-MSVC-CXX.cmake
-share/cmake-${CMAKE_API}/Modules/Platform/WindowsCE-MSVC.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/WindowsCE.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/WindowsPaths.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/WindowsPhone-MSVC-C.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/WindowsPhone-MSVC-CXX.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/WindowsPhone.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/WindowsStore-MSVC-C.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/WindowsStore-MSVC-CXX.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/WindowsStore.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Xenix.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/eCos.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/gas.cmake
@@ -1582,6 +1752,7 @@ share/cmake-${CMAKE_API}/Modules/UsewxWidgets.cmake
 share/cmake-${CMAKE_API}/Modules/VTKCompatibility.cmake
 share/cmake-${CMAKE_API}/Modules/WIX.template.in
 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/kde3init_dummy.cpp.in
@@ -1604,6 +1775,12 @@ share/cmake-${CMAKE_API}/Templates/EXEWinHeader.dsptemplate
 share/cmake-${CMAKE_API}/Templates/TestDriver.cxx.in
 share/cmake-${CMAKE_API}/Templates/UtilityFooter.dsptemplate
 share/cmake-${CMAKE_API}/Templates/UtilityHeader.dsptemplate
+share/cmake-${CMAKE_API}/Templates/Windows/ApplicationIcon.png
+share/cmake-${CMAKE_API}/Templates/Windows/Logo.png
+share/cmake-${CMAKE_API}/Templates/Windows/SmallLogo.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}/Templates/staticLibFooter.dsptemplate
 share/cmake-${CMAKE_API}/Templates/staticLibHeader.dsptemplate
diff --git a/devel/cmake/distinfo b/devel/cmake/distinfo
index f6af8961c7d..9a106bfadf3 100644
--- a/devel/cmake/distinfo
+++ b/devel/cmake/distinfo
@@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.62 2014/10/01 07:33:24 adam Exp $
+$NetBSD: distinfo,v 1.63 2015/01/17 13:29:55 adam Exp $
 
-SHA1 (cmake-3.0.2.tar.gz) = 379472e3578902a1d6f8b68a9987773151d6f21a
-RMD160 (cmake-3.0.2.tar.gz) = b94ea2ed4dced373e289fa5f66674a227135f350
-Size (cmake-3.0.2.tar.gz) = 5490501 bytes
-SHA1 (patch-Modules_FindX11.cmake) = e5c9f5fd382effb85ae75fe603de00e5e58d788a
+SHA1 (cmake-3.1.0.tar.gz) = cc20c40f5480c83a0204f516a490b470bd3a963a
+RMD160 (cmake-3.1.0.tar.gz) = 00390c46b82fda47bb13fc740d4cd037bf66a8c1
+Size (cmake-3.1.0.tar.gz) = 5955836 bytes
+SHA1 (patch-Modules_FindX11.cmake) = 07a831744fc1de15d2fe4f57399339200e572dc5
 SHA1 (patch-Modules_Platform_SCO__SV.cmake) = 3ed230b3a06ea693812db8f57bc73aebec12b99f
 SHA1 (patch-Modules_Platform_SunOS.cmake) = 7a53ae3c902dd69ee22ef9fe0ae2a022d5284f16
-SHA1 (patch-Source_cmELF.cxx) = da40cca878c400cbb3f1867b3a1e919c0183a68a
+SHA1 (patch-Source_cmELF.cxx) = 5eb9dc0b3567b5685596ddf0a03ca8e5c76e6f92
 SHA1 (patch-Source_kwsys_SystemInformation.cxx) = e259da70601cf1b4641f253de3d4f3aaec5e68f6
-SHA1 (patch-Source_kwsys_SystemTools.cxx) = e901b9ed4ae7f8d802bb74c22e1680dd3d62726a
+SHA1 (patch-Source_kwsys_SystemTools.cxx) = 634348b9bc8ccf8c72f23837baa6ba0bcacf5961
 SHA1 (patch-Utilities_KWIML_CMakeLists.txt) = 4e8cef0eab2ad8cb27cd7076e077bb5e7425a95c
 SHA1 (patch-aa) = 97bfad3d2c357e9af01677ba86057b78f0661b9b
-SHA1 (patch-ab) = aee3fb2f908aed1ce6e92b7c7ccf5b06f0596502
-SHA1 (patch-ac) = fe679b28793d6a7b9fd41cbcb7288295a4c4a508
+SHA1 (patch-ab) = d1b39bdcd654f2a4fc63463cd20de656cce3cf8f
+SHA1 (patch-ac) = b5cedc6a2354beaf08e06d416c150154a7dc1f05
diff --git a/devel/cmake/patches/patch-Modules_FindX11.cmake b/devel/cmake/patches/patch-Modules_FindX11.cmake
index 5adeb8990df..fa241516964 100644
--- a/devel/cmake/patches/patch-Modules_FindX11.cmake
+++ b/devel/cmake/patches/patch-Modules_FindX11.cmake
@@ -1,12 +1,12 @@
-$NetBSD: patch-Modules_FindX11.cmake,v 1.5 2012/11/15 19:31:55 adam Exp $
+$NetBSD: patch-Modules_FindX11.cmake,v 1.6 2015/01/17 13:29:55 adam Exp $
 
 Patch in pkgsrc paths for finding X.
 
---- Modules/FindX11.cmake.orig	2012-10-31 15:32:05.000000000 +0000
+--- Modules/FindX11.cmake.orig	2014-12-15 20:07:43.000000000 +0000
 +++ Modules/FindX11.cmake
-@@ -61,7 +61,8 @@ if (UNIX)
-   set(CMAKE_FIND_FRAMEWORK_SAVE ${CMAKE_FIND_FRAMEWORK})
-   set(CMAKE_FIND_FRAMEWORK NEVER)
+@@ -73,7 +73,8 @@ if (UNIX)
+   set(CMAKE_REQUIRED_QUIET_SAVE ${CMAKE_REQUIRED_QUIET})
+   set(CMAKE_REQUIRED_QUIET ${X11_FIND_QUIETLY})
    set(X11_INC_SEARCH_PATH
 -    /usr/pkg/xorg/include
 +    @LOCALBASE@/xorg/include
@@ -14,7 +14,7 @@ Patch in pkgsrc paths for finding X.
      /usr/X11R6/include
      /usr/X11R7/include
      /usr/include/X11
-@@ -71,7 +72,8 @@ if (UNIX)
+@@ -84,7 +85,8 @@ if (UNIX)
    )
  
    set(X11_LIB_SEARCH_PATH
diff --git a/devel/cmake/patches/patch-Source_cmELF.cxx b/devel/cmake/patches/patch-Source_cmELF.cxx
index 58b414531a4..8d624d5047e 100644
--- a/devel/cmake/patches/patch-Source_cmELF.cxx
+++ b/devel/cmake/patches/patch-Source_cmELF.cxx
@@ -1,10 +1,10 @@
-$NetBSD: patch-Source_cmELF.cxx,v 1.1 2014/07/17 13:44:28 ryoon Exp $
+$NetBSD: patch-Source_cmELF.cxx,v 1.2 2015/01/17 13:29:55 adam Exp $
 
 * SCO OpenServer 5.0.7/3.2 has not 64bit ELF support.
 
---- Source/cmELF.cxx.orig	2014-01-16 17:15:08.000000000 +0000
+--- Source/cmELF.cxx.orig	2014-12-15 20:07:43.000000000 +0000
 +++ Source/cmELF.cxx
-@@ -28,6 +28,9 @@
+@@ -49,6 +49,9 @@
  #if defined(__sun)
  # include <sys/link.h> // For dynamic section information
  #endif
@@ -14,29 +14,29 @@ $NetBSD: patch-Source_cmELF.cxx,v 1.1 2014/07/17 13:44:28 ryoon Exp $
  
  //----------------------------------------------------------------------------
  // Low-level byte swapping implementation.
-@@ -181,6 +184,8 @@ struct cmELFTypes32
+@@ -203,6 +206,8 @@ struct cmELFTypes32
  };
  
- // Configure the implementation template for 32-bit ELF files.
+ // Configure the implementation template for 64-bit ELF files.
 +#if !defined(_SCO_DS)
-+// SCO OpenServer 5.0.7/3.2 has not 64bit ELF support.
++// SCO OpenServer 5.0.7/3.2 does not support 64-bit ELF.
  struct cmELFTypes64
  {
    typedef Elf64_Ehdr ELF_Ehdr;
-@@ -189,6 +194,7 @@ struct cmELFTypes64
-   typedef Elf64_Half ELF_Half;
+@@ -212,6 +217,7 @@ struct cmELFTypes64
+   typedef cmIML_INT_uint64_t tagtype;
    static const char* GetName() { return "64-bit"; }
  };
 +#endif
  
  //----------------------------------------------------------------------------
  // Parser implementation template.
-@@ -764,11 +770,14 @@ cmELF::cmELF(const char* fname): Interna
+@@ -788,11 +794,14 @@ cmELF::cmELF(const char* fname): Interna
      // 32-bit ELF
      this->Internal = new cmELFInternalImpl<cmELFTypes32>(this, fin, order);
      }
 +#if !defined(_SCO_DS)
-+// SCO OpenServer 5.0.7/3.2 has not 64bit ELF support.
++// SCO OpenServer 5.0.7/3.2 does not support 64-bit ELF.
    else if(ident[EI_CLASS] == ELFCLASS64)
      {
      // 64-bit ELF
diff --git a/devel/cmake/patches/patch-Source_kwsys_SystemTools.cxx b/devel/cmake/patches/patch-Source_kwsys_SystemTools.cxx
index 5d0d6020fd3..040806b896d 100644
--- a/devel/cmake/patches/patch-Source_kwsys_SystemTools.cxx
+++ b/devel/cmake/patches/patch-Source_kwsys_SystemTools.cxx
@@ -1,19 +1,20 @@
-$NetBSD: patch-Source_kwsys_SystemTools.cxx,v 1.2 2014/08/10 10:02:51 adam Exp $
+$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-07-31 15:03:57.000000000 +0000
+--- Source/kwsys/SystemTools.cxx.orig	2014-12-15 20:07:43.000000000 +0000
 +++ Source/kwsys/SystemTools.cxx
-@@ -1081,7 +1081,12 @@ bool SystemTools::FileExists(const char*
-   return (GetFileAttributesW(Encoding::ToWide(filename).c_str())
+@@ -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, F_OK) == 0;
-+#  else
-   return access(filename, R_OK) == 0;
-+#  endif
++#if defined(_SCO_DS)
++  return access(filename.c_str(), F_OK) == 0;
++#else
+   return access(filename.c_str(), R_OK) == 0;
  #endif
++#endif
  }
  
+ //----------------------------------------------------------------------------
diff --git a/devel/cmake/patches/patch-ab b/devel/cmake/patches/patch-ab
index 8ba0a80e23c..6ce983552b1 100644
--- a/devel/cmake/patches/patch-ab
+++ b/devel/cmake/patches/patch-ab
@@ -1,14 +1,13 @@
-$NetBSD: patch-ab,v 1.14 2012/09/14 13:26:20 wiz Exp $
+$NetBSD: patch-ab,v 1.15 2015/01/17 13:29:55 adam Exp $
 
 Insist on select python version for pkgsrc.
 
---- Modules/FindPythonInterp.cmake.orig	2012-04-18 18:10:54.000000000 +0000
+--- Modules/FindPythonInterp.cmake.orig	2014-12-15 20:07:43.000000000 +0000
 +++ Modules/FindPythonInterp.cmake
-@@ -60,14 +60,20 @@ endif(PythonInterp_FIND_VERSION)
- 
- list(APPEND _Python_NAMES python)
- 
--# Search for the current active python version first
+@@ -75,7 +75,14 @@ if(PythonInterp_FIND_VERSION)
+ else()
+     set(_PYTHON_FIND_OTHER_VERSIONS ${_PYTHON3_VERSIONS} ${_PYTHON2_VERSIONS} ${_PYTHON1_VERSIONS})
+ endif()
 -find_program(PYTHON_EXECUTABLE NAMES ${_Python_NAMES})
 +# for pkgsrc: force Python version (set in pyversion.mk)
 +IF(DEFINED PYVERSSUFFIX)
@@ -21,10 +20,12 @@ Insist on select python version for pkgsrc.
  
  # Set up the versions we know about, in the order we will search. Always add
  # the user supplied additional versions to the front.
- set(_Python_VERSIONS
-   ${Python_ADDITIONAL_VERSIONS}
--  ${_PYTHON_FIND_OTHER_VERSIONS}
-+  ${_VERSIONS}
-   )
+@@ -91,7 +98,7 @@ if(DEFINED PYTHONLIBS_VERSION_STRING)
+ endif()
+ # Search for the current active python version first
+ list(APPEND _Python_VERSIONS ";")
+-list(APPEND _Python_VERSIONS ${_PYTHON_FIND_OTHER_VERSIONS})
++list(APPEND _Python_VERSIONS ${_VERSIONS})
  
  unset(_PYTHON_FIND_OTHER_VERSIONS)
+ unset(_PYTHON1_VERSIONS)
diff --git a/devel/cmake/patches/patch-ac b/devel/cmake/patches/patch-ac
index 09660f3c6c4..580e7e033ec 100644
--- a/devel/cmake/patches/patch-ac
+++ b/devel/cmake/patches/patch-ac
@@ -1,10 +1,10 @@
-$NetBSD: patch-ac,v 1.10 2012/11/15 19:31:55 adam Exp $
+$NetBSD: patch-ac,v 1.11 2015/01/17 13:29:55 adam Exp $
 
 Insist on select python version for pkgsrc.
 
---- Modules/FindPythonLibs.cmake.orig	2012-08-09 18:15:19.000000000 +0000
+--- Modules/FindPythonLibs.cmake.orig	2014-12-15 20:07:43.000000000 +0000
 +++ Modules/FindPythonLibs.cmake
-@@ -67,11 +67,18 @@ ELSE(PythonLibs_FIND_VERSION)
+@@ -82,6 +82,13 @@ else()
      set(_PYTHON_FIND_OTHER_VERSIONS ${_PYTHON3_VERSIONS} ${_PYTHON2_VERSIONS} ${_PYTHON1_VERSIONS})
  endif()
  
@@ -17,10 +17,13 @@ Insist on select python version for pkgsrc.
 +
  # Set up the versions we know about, in the order we will search. Always add
  # the user supplied additional versions to the front.
- set(_Python_VERSIONS
-   ${Python_ADDITIONAL_VERSIONS}
--  ${_PYTHON_FIND_OTHER_VERSIONS}
-+  ${_VERSIONS}
-   )
+ # If FindPythonInterp has already found the major and minor version,
+@@ -91,7 +98,7 @@ set(_Python_VERSIONS ${Python_ADDITIONAL
+ if(DEFINED PYTHON_VERSION_MAJOR AND DEFINED PYTHON_VERSION_MINOR)
+   list(APPEND _Python_VERSIONS ${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR})
+ endif()
+-list(APPEND _Python_VERSIONS ${_PYTHON_FIND_OTHER_VERSIONS})
++list(APPEND _Python_VERSIONS ${_VERSIONS})
  
  unset(_PYTHON_FIND_OTHER_VERSIONS)
+ unset(_PYTHON1_VERSIONS)