summaryrefslogtreecommitdiffstats
path: root/Source/cmGlobalVisualStudio14Generator.h
diff options
context:
space:
mode:
authorjonathan molinatto <jonathan.molinatto@gmail.com>2020-08-20 16:31:21 (GMT)
committerBrad King <brad.king@kitware.com>2020-08-25 19:27:38 (GMT)
commitba497111f6541096313af187a1f70e4594a63059 (patch)
tree7489574ac5bf8ac27ba42b15db8db1df5b902329 /Source/cmGlobalVisualStudio14Generator.h
parent8de3a25ec34c4b2d3cd7e519d3c3607e81de34c4 (diff)
downloadCMake-ba497111f6541096313af187a1f70e4594a63059.zip
CMake-ba497111f6541096313af187a1f70e4594a63059.tar.gz
CMake-ba497111f6541096313af187a1f70e4594a63059.tar.bz2
VS: Add option for custom Win10 SDK version maximum
Since commit 83ddc4d289 (VS: Do not select a Windows SDK too high for current VS version, 2017-08-07, v3.13.0-rc1~72^2~2) we enforce a maximum SDK version for the VS 2015 generator. The blog post linked in the original commit is no longer available, but it can be seen here: * https://web.archive.org/web/20190108032520/https://blogs.msdn.microsoft.com/chuckw/2018/10/02/windows-10-october-2018-update/ In particular, it states: > VS 2015 Users: The Windows 10 SDK (15063, 16299, 17134, 17763) > is officially only supported for VS 2017. However, in some circumstances a higher version can be used. Add a `CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION_MAXIMUM` to override the generator's default maximum SDK version. Fixes: #20633
Diffstat (limited to 'Source/cmGlobalVisualStudio14Generator.h')
-rw-r--r--Source/cmGlobalVisualStudio14Generator.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmGlobalVisualStudio14Generator.h b/Source/cmGlobalVisualStudio14Generator.h
index 39353f2..2b9a649 100644
--- a/Source/cmGlobalVisualStudio14Generator.h
+++ b/Source/cmGlobalVisualStudio14Generator.h
@@ -43,7 +43,7 @@ protected:
// Used to make sure that the Windows 10 SDK selected can work with the
// version of the toolset.
- virtual std::string GetWindows10SDKMaxVersion() const;
+ virtual std::string GetWindows10SDKMaxVersion(cmMakefile* mf) const;
virtual bool SelectWindows10SDK(cmMakefile* mf, bool required);
@@ -54,7 +54,7 @@ protected:
// installed on the machine.
bool IsWindowsDesktopToolsetInstalled() const override;
- std::string GetWindows10SDKVersion();
+ std::string GetWindows10SDKVersion(cmMakefile* mf);
private:
class Factory;