summaryrefslogtreecommitdiffstats
path: root/Help
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2016-01-25 14:47:11 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2016-01-25 14:47:11 (GMT)
commit0586f1798e5dde39c18f70fb5c411902c2bf5357 (patch)
tree0df0309026515d9eac2cf0d8c77a3df80ae9445c /Help
parent9722f8f9a5b1c1ec24b6cb6edf5edd59922e90a5 (diff)
parentd7e863c1c1f4962f589e53b42a87a66cf5ab00b7 (diff)
downloadCMake-0586f1798e5dde39c18f70fb5c411902c2bf5357.zip
CMake-0586f1798e5dde39c18f70fb5c411902c2bf5357.tar.gz
CMake-0586f1798e5dde39c18f70fb5c411902c2bf5357.tar.bz2
Merge topic 'vs-win10-sdk'
d7e863c1 VS: Do not fail on Windows 10 with VS 2015 if no SDK is available (#15929)
Diffstat (limited to 'Help')
-rw-r--r--Help/variable/CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION.rst3
1 files changed, 2 insertions, 1 deletions
diff --git a/Help/variable/CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION.rst b/Help/variable/CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION.rst
index 6392849..e0be3a4 100644
--- a/Help/variable/CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION.rst
+++ b/Help/variable/CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION.rst
@@ -8,4 +8,5 @@ specification of a target Windows version to select a corresponding SDK.
The :variable:`CMAKE_SYSTEM_VERSION` variable may be set to specify a
version. Otherwise CMake computes a default version based on the Windows
SDK versions available. The chosen Windows target version number is provided
-in ``CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION``.
+in ``CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION``. If no Windows 10 SDK
+is available this value will be empty.