kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'vs-win10-sdk'

Browse Source 
45812111 VS: Select latest Windows 10 SDK if no specific version was requested
This commit is contained in:
Brad King 2015-10-05 10:04:09 -04:00 committed by CMake Topic Stage
commit 518dc27728
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Source/cmGlobalVisualStudio14Generator.cxx
View File

@ -202,10 +202,18 @@ std::string cmGlobalVisualStudio14Generator::GetWindows10SDKVersion()
// has a version less or equal to our version of the operating system // has a version less or equal to our version of the operating system
std::sort(sdks.begin(), sdks.end(), cmSystemTools::VersionCompareGreater); std::sort(sdks.begin(), sdks.end(), cmSystemTools::VersionCompareGreater);
// 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
for (std::vector<std::string>::iterator i = sdks.begin(); for (std::vector<std::string>::iterator i = sdks.begin();
i != sdks.end(); ++i) i != sdks.end(); ++i)
{ {
// Find the SDK less or equal to our specified version
if (!cmSystemTools::VersionCompareGreater(*i, this->SystemVersion)) if (!cmSystemTools::VersionCompareGreater(*i, this->SystemVersion))
{ {
// This is the most recent SDK that we can run safely // This is the most recent SDK that we can run safely
@ -213,6 +221,7 @@ std::string cmGlobalVisualStudio14Generator::GetWindows10SDKVersion()
} }
} }
} }
}
#endif #endif
// Return an empty string // Return an empty string
return std::string(); return std::string();