diff options
| author | jonathan molinatto <jonathan.molinatto@elastic.co> | 2021-01-20 14:55:41 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2021-01-20 19:46:34 (GMT) |
| commit | 1e67482daf417135d09054327368c6651c33fa84 (patch) | |
| tree | a109ed1ea55783c64b2211d14266af095a10e996 /Source/cmGlobalVisualStudio14Generator.cxx | |
| parent | 2c0e4c37624e673a6d513cffc8edb1d595d175a9 (diff) | |
| download | CMake-1e67482daf417135d09054327368c6651c33fa84.zip CMake-1e67482daf417135d09054327368c6651c33fa84.tar.gz CMake-1e67482daf417135d09054327368c6651c33fa84.tar.bz2 | |
VS: Generalize Win10 max SDK version to all VS generators
The `CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION_MAXIMUM` variable added in
CMake 3.19 by commit ba497111f6 (VS: Add option for custom Win10 SDK
version maximum, 2020-08-20, v3.19.0-rc1~262^2) was documented as if it
worked for all generators but implemented only to override CMake's
builtin default for the VS 2015 max SDK version. Generalize the
variable to set a custom max SDK version for later VS versions too.
Fixes: #21720
Diffstat (limited to 'Source/cmGlobalVisualStudio14Generator.cxx')
| -rw-r--r-- | Source/cmGlobalVisualStudio14Generator.cxx | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Source/cmGlobalVisualStudio14Generator.cxx b/Source/cmGlobalVisualStudio14Generator.cxx index e17c6d7..b46f1b9 100644 --- a/Source/cmGlobalVisualStudio14Generator.cxx +++ b/Source/cmGlobalVisualStudio14Generator.cxx @@ -253,6 +253,12 @@ std::string cmGlobalVisualStudio14Generator::GetWindows10SDKMaxVersion( // If value is an invalid pointer, leave result unchanged. } + return this->GetWindows10SDKMaxVersionDefault(mf); +} + +std::string cmGlobalVisualStudio14Generator::GetWindows10SDKMaxVersionDefault( + cmMakefile*) const +{ // The last Windows 10 SDK version that VS 2015 can target is 10.0.14393.0. // // "VS 2015 Users: The Windows 10 SDK (15063, 16299, 17134, 17763) is |