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.h | |
| 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.h')
| -rw-r--r-- | Source/cmGlobalVisualStudio14Generator.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Source/cmGlobalVisualStudio14Generator.h b/Source/cmGlobalVisualStudio14Generator.h index 1ccd4c7..7804b83 100644 --- a/Source/cmGlobalVisualStudio14Generator.h +++ b/Source/cmGlobalVisualStudio14Generator.h @@ -40,9 +40,13 @@ protected: // of the toolset is installed bool IsWindowsStoreToolsetInstalled() const; + // Used to adjust the max-SDK-version calculation to accommodate user + // configuration. + std::string GetWindows10SDKMaxVersion(cmMakefile* mf) const; + // Used to make sure that the Windows 10 SDK selected can work with the // version of the toolset. - virtual std::string GetWindows10SDKMaxVersion(cmMakefile* mf) const; + virtual std::string GetWindows10SDKMaxVersionDefault(cmMakefile* mf) const; virtual bool SelectWindows10SDK(cmMakefile* mf, bool required); |