echo/CMake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

VS: Do not select a Windows SDK too high for current VS version

Browse Source 
Add an internal API for the maximum Windows 10 SDK version supported by
a toolset.  For Visual Studio 14 2015 that would be the version
"10.0.14393.0".

Fixes: #17788
This commit is contained in:
Gilles Khouzam 2017-08-07 10:38:50 -07:00 committed by Brad King
parent f0c84346ed
commit 83ddc4d289
4 changed files with 37 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Source/cmGlobalVisualStudio14Generator.cxx
View File

@ -212,6 +212,12 @@ bool cmGlobalVisualStudio14Generator::IsWindowsStoreToolsetInstalled() const
cmSystemTools::KeyWOW64_32); cmSystemTools::KeyWOW64_32);
} }
std::string cmGlobalVisualStudio14Generator::GetWindows10SDKMaxVersion() const
{
// The last Windows 10 SDK version that VS 2015 can target is 10.0.14393.0.
return "10.0.14393.0";
}
#if defined(_WIN32) && !defined(__CYGWIN__) #if defined(_WIN32) && !defined(__CYGWIN__)
struct NoWindowsH struct NoWindowsH
{ {
@ -220,6 +226,20 @@ struct NoWindowsH
return !cmSystemTools::FileExists(p + "/um/windows.h", true); return !cmSystemTools::FileExists(p + "/um/windows.h", true);
} }
}; };
class WindowsSDKTooRecent
{
std::string const& MaxVersion;
public:
WindowsSDKTooRecent(std::string const& maxVersion)
: MaxVersion(maxVersion)
{
}
bool operator()(std::string const& v)
{
return cmSystemTools::VersionCompareGreater(v, MaxVersion);
}
};
#endif #endif
std::string cmGlobalVisualStudio14Generator::GetWindows10SDKVersion() std::string cmGlobalVisualStudio14Generator::GetWindows10SDKVersion()
@ -276,6 +296,12 @@ std::string cmGlobalVisualStudio14Generator::GetWindows10SDKVersion()
// Sort the results to make sure we select the most recent one. // Sort the results to make sure we select the most recent one.
std::sort(sdks.begin(), sdks.end(), cmSystemTools::VersionCompareGreater); std::sort(sdks.begin(), sdks.end(), cmSystemTools::VersionCompareGreater);
// Skip SDKs that cannot be used with our toolset.
std::string maxVersion = this->GetWindows10SDKMaxVersion();
if (!maxVersion.empty()) {
cmEraseIf(sdks, WindowsSDKTooRecent(maxVersion));
}
// Look for a SDK exactly matching the requested target version. // Look for a SDK exactly matching the requested target version.
for (std::string const& i : sdks) { for (std::string const& i : sdks) {
if (cmSystemTools::VersionCompareEqual(i, this->SystemVersion)) { if (cmSystemTools::VersionCompareEqual(i, this->SystemVersion)) {

4
Source/cmGlobalVisualStudio14Generator.h
View File

@ -37,6 +37,10 @@ protected:
// of the toolset is installed // of the toolset is installed
bool IsWindowsStoreToolsetInstalled() const; bool IsWindowsStoreToolsetInstalled() const;
// Used to make sure that the Windows 10 SDK selected can work with the
// version of the toolset.
virtual std::string GetWindows10SDKMaxVersion() const;
const char* GetIDEVersion() override { return "14.0"; } const char* GetIDEVersion() override { return "14.0"; }
virtual bool SelectWindows10SDK(cmMakefile* mf, bool required); virtual bool SelectWindows10SDK(cmMakefile* mf, bool required);

5
Source/cmGlobalVisualStudio15Generator.cxx
View File

@ -258,6 +258,11 @@ bool cmGlobalVisualStudio15Generator::IsWin81SDKInstalled() const
return false; return false;
} }
std::string cmGlobalVisualStudio15Generator::GetWindows10SDKMaxVersion() const
{
return std::string();
}
std::string cmGlobalVisualStudio15Generator::FindMSBuildCommand() std::string cmGlobalVisualStudio15Generator::FindMSBuildCommand()
{ {
std::string msbuild; std::string msbuild;

2
Source/cmGlobalVisualStudio15Generator.h
View File

@ -52,6 +52,8 @@ protected:
// Check for a Win 8 SDK known to the registry or VS installer tool. // Check for a Win 8 SDK known to the registry or VS installer tool.
bool IsWin81SDKInstalled() const; bool IsWin81SDKInstalled() const;
std::string GetWindows10SDKMaxVersion() const override;
std::string FindMSBuildCommand() override; std::string FindMSBuildCommand() override;
std::string FindDevEnvCommand() override; std::string FindDevEnvCommand() override;