summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-10-05 14:04:09 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2015-10-05 14:04:09 (GMT)
commit518dc277281cf2280f9846f2ce2039440cda4ba9 (patch)
tree3bdb62d413dc4fc7449278b46e45130ac553aedc
parent99c7c23abe6342ca2ecab1f04cf396362bd56930 (diff)
parent458121116a05665ebc0cf6a066977c00b8e55e5c (diff)
downloadCMake-518dc277281cf2280f9846f2ce2039440cda4ba9.zip
CMake-518dc277281cf2280f9846f2ce2039440cda4ba9.tar.gz
CMake-518dc277281cf2280f9846f2ce2039440cda4ba9.tar.bz2
Merge topic 'vs-win10-sdk'
45812111 VS: Select latest Windows 10 SDK if no specific version was requested
-rw-r--r--Source/cmGlobalVisualStudio14Generator.cxx19
1 files changed, 14 insertions, 5 deletions
diff --git a/Source/cmGlobalVisualStudio14Generator.cxx b/Source/cmGlobalVisualStudio14Generator.cxx
index 74679d8..661dddd 100644
--- a/Source/cmGlobalVisualStudio14Generator.cxx
+++ b/Source/cmGlobalVisualStudio14Generator.cxx
@@ -202,14 +202,23 @@ std::string cmGlobalVisualStudio14Generator::GetWindows10SDKVersion()
// has a version less or equal to our version of the operating system
std::sort(sdks.begin(), sdks.end(), cmSystemTools::VersionCompareGreater);
- for (std::vector<std::string>::iterator i = sdks.begin();
- i != sdks.end(); ++i)
+ // Select a suitable SDK version.
+ if (this->SystemVersion == "10.0")
+ {
+ // Use the latest Windows 10 SDK since no build version was given.
+ return sdks.at(0);
+ }
+ else
{
// Find the SDK less or equal to our specified version
- if (!cmSystemTools::VersionCompareGreater(*i, this->SystemVersion))
+ for (std::vector<std::string>::iterator i = sdks.begin();
+ i != sdks.end(); ++i)
{
- // This is the most recent SDK that we can run safely
- return *i;
+ if (!cmSystemTools::VersionCompareGreater(*i, this->SystemVersion))
+ {
+ // This is the most recent SDK that we can run safely
+ return *i;
+ }
}
}
}