From 126ce56c3b1e1d601effde62aa2357d403a5f794 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=BE=D0=BB=D0=B0=D0=B9?= <unril@live.ru>
Date: Sat, 12 Mar 2016 19:02:15 +0300
Subject: [PATCH] Try to get CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION from the
 cache before getting it from the register

---
 Source/cmGlobalVisualStudio14Generator.cxx | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/Source/cmGlobalVisualStudio14Generator.cxx b/Source/cmGlobalVisualStudio14Generator.cxx
index c058f8c..0b4bbed 100644
--- a/Source/cmGlobalVisualStudio14Generator.cxx
+++ b/Source/cmGlobalVisualStudio14Generator.cxx
@@ -153,9 +153,17 @@ bool cmGlobalVisualStudio14Generator::InitializeWindowsStore(cmMakefile* mf)
 //----------------------------------------------------------------------------
 bool cmGlobalVisualStudio14Generator::SelectWindows10SDK(cmMakefile* mf,
                                                          bool required)
-{
-  // Find the default version of the Windows 10 SDK.
-  this->WindowsTargetPlatformVersion = this->GetWindows10SDKVersion();
+{ 
+  std::string vsWinTargetPlatformVersion = "CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION";
+  if(mf->IsDefinitionSet(vsWinTargetPlatformVersion)) 
+    {
+	this->WindowsTargetPlatformVersion = mf->GetDefinition(vsWinTargetPlatformVersion);
+    }
+  else
+    {
+	// Find the default version of the Windows 10 SDK.
+	this->WindowsTargetPlatformVersion = this->GetWindows10SDKVersion();
+    }
   if (required && this->WindowsTargetPlatformVersion.empty())
     {
     std::ostringstream  e;
@@ -164,7 +172,7 @@ bool cmGlobalVisualStudio14Generator::SelectWindows10SDK(cmMakefile* mf,
     mf->IssueMessage(cmake::FATAL_ERROR, e.str());
     return false;
     }
-  mf->AddDefinition("CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION",
+  mf->AddDefinition(vsWinTargetPlatformVersion,
                     this->WindowsTargetPlatformVersion.c_str());
   return true;
 }
-- 
2.7.0.windows.1