diff options
author | Brad King <brad.king@kitware.com> | 2017-02-20 14:46:58 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2017-02-21 18:47:54 (GMT) |
commit | 2da0838c64b6d43fd12eecb5d65ac458a335b266 (patch) | |
tree | 08459ec2d741fd419fa21b2ec61a9e284932934f /Source/cmGlobalVisualStudio15Generator.h | |
parent | 6cbad490c2fdbd9bdc67b406b9f2dcdc21e08ddb (diff) | |
download | CMake-2da0838c64b6d43fd12eecb5d65ac458a335b266.zip CMake-2da0838c64b6d43fd12eecb5d65ac458a335b266.tar.gz CMake-2da0838c64b6d43fd12eecb5d65ac458a335b266.tar.bz2 |
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 <gnaggnoyil@gmail.com>
Diffstat (limited to 'Source/cmGlobalVisualStudio15Generator.h')
-rw-r--r-- | Source/cmGlobalVisualStudio15Generator.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Source/cmGlobalVisualStudio15Generator.h b/Source/cmGlobalVisualStudio15Generator.h index 781b41e..f979b65 100644 --- a/Source/cmGlobalVisualStudio15Generator.h +++ b/Source/cmGlobalVisualStudio15Generator.h @@ -28,6 +28,7 @@ public: virtual const char* GetToolsVersion() { return "15.0"; } protected: + bool InitializeWindows(cmMakefile* mf) CM_OVERRIDE; virtual bool SelectWindowsStoreToolset(std::string& toolset) const; virtual const char* GetIDEVersion() { return "15.0"; } @@ -40,6 +41,9 @@ protected: // of the toolset is installed 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 FindDevEnvCommand() CM_OVERRIDE; |