Commit 2da0838c authored by Brad King's avatar Brad King
Browse files

VS2017: If Win 8.1 SDK is not available, use Win 10 SDK



We try to choose the Windows SDK version based on the version of Windows
targeted by the build.  However, if using VS 2017 without the Windows
8.1 SDK installed then we must fall back to the Windows 10 SDK even when
targeting an older version of Windows.
Inspired-by: gnaggnoyil's avatargnaggnoyil <gnaggnoyil@gmail.com>
parent 6cbad490
...@@ -109,6 +109,18 @@ void cmGlobalVisualStudio15Generator::WriteSLNHeader(std::ostream& fout) ...@@ -109,6 +109,18 @@ void cmGlobalVisualStudio15Generator::WriteSLNHeader(std::ostream& fout)
} }
} }
bool cmGlobalVisualStudio15Generator::InitializeWindows(cmMakefile* mf)
{
// If the Win 8.1 SDK is installed then we can select a SDK matching
// the target Windows version.
if (this->IsWin81SDKInstalled()) {
return cmGlobalVisualStudio14Generator::InitializeWindows(mf);
}
// Otherwise we must choose a Win 10 SDK even if we are not targeting
// Windows 10.
return this->SelectWindows10SDK(mf, false);
}
bool cmGlobalVisualStudio15Generator::SelectWindowsStoreToolset( bool cmGlobalVisualStudio15Generator::SelectWindowsStoreToolset(
std::string& toolset) const std::string& toolset) const
{ {
...@@ -135,6 +147,28 @@ bool cmGlobalVisualStudio15Generator::IsWindowsStoreToolsetInstalled() const ...@@ -135,6 +147,28 @@ bool cmGlobalVisualStudio15Generator::IsWindowsStoreToolsetInstalled() const
return vsSetupAPIHelper.IsWin10SDKInstalled(); return vsSetupAPIHelper.IsWin10SDKInstalled();
} }
bool cmGlobalVisualStudio15Generator::IsWin81SDKInstalled() const
{
// Does the VS installer tool know about one?
if (vsSetupAPIHelper.IsWin81SDKInstalled()) {
return true;
}
// Does the registry know about one (e.g. from VS 2015)?
std::string win81Root;
if (cmSystemTools::ReadRegistryValue(
"HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\"
"Windows Kits\\Installed Roots;KitsRoot81",
win81Root, cmSystemTools::KeyWOW64_32) ||
cmSystemTools::ReadRegistryValue(
"HKEY_CURRENT_USER\\SOFTWARE\\Microsoft\\"
"Windows Kits\\Installed Roots;KitsRoot81",
win81Root, cmSystemTools::KeyWOW64_32)) {
return true;
}
return false;
}
std::string cmGlobalVisualStudio15Generator::FindMSBuildCommand() std::string cmGlobalVisualStudio15Generator::FindMSBuildCommand()
{ {
std::string msbuild; std::string msbuild;
......
...@@ -28,6 +28,7 @@ public: ...@@ -28,6 +28,7 @@ public:
virtual const char* GetToolsVersion() { return "15.0"; } virtual const char* GetToolsVersion() { return "15.0"; }
protected: protected:
bool InitializeWindows(cmMakefile* mf) CM_OVERRIDE;
virtual bool SelectWindowsStoreToolset(std::string& toolset) const; virtual bool SelectWindowsStoreToolset(std::string& toolset) const;
virtual const char* GetIDEVersion() { return "15.0"; } virtual const char* GetIDEVersion() { return "15.0"; }
...@@ -40,6 +41,9 @@ protected: ...@@ -40,6 +41,9 @@ protected:
// of the toolset is installed // of the toolset is installed
bool IsWindowsStoreToolsetInstalled() const; bool IsWindowsStoreToolsetInstalled() const;
// Check for a Win 8 SDK known to the registry or VS installer tool.
bool IsWin81SDKInstalled() const;
std::string FindMSBuildCommand() CM_OVERRIDE; std::string FindMSBuildCommand() CM_OVERRIDE;
std::string FindDevEnvCommand() CM_OVERRIDE; std::string FindDevEnvCommand() CM_OVERRIDE;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment