diff options
| author | Brad King <brad.king@kitware.com> | 2023-03-31 17:21:29 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2023-04-05 16:06:22 (GMT) |
| commit | e259063b0a52768dfb1960401b363437e30baf40 (patch) | |
| tree | 70add28ea03d238c33d08c6ffbcf4d18546594ea /Source/cmGlobalVisualStudioVersionedGenerator.cxx | |
| parent | 8499374c6a7114d83a8768edd611caf02d9941a1 (diff) | |
| download | CMake-e259063b0a52768dfb1960401b363437e30baf40.zip CMake-e259063b0a52768dfb1960401b363437e30baf40.tar.gz CMake-e259063b0a52768dfb1960401b363437e30baf40.tar.bz2 | |
VS: Defer Windows SDK selection until CMAKE_GENERATOR_PLATFORM is known
Prepare to teach `CMAKE_GENERATOR_PLATFORM` to affect SDK selection.
Diffstat (limited to 'Source/cmGlobalVisualStudioVersionedGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalVisualStudioVersionedGenerator.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/cmGlobalVisualStudioVersionedGenerator.cxx b/Source/cmGlobalVisualStudioVersionedGenerator.cxx index f4a4d3d..f3936ce 100644 --- a/Source/cmGlobalVisualStudioVersionedGenerator.cxx +++ b/Source/cmGlobalVisualStudioVersionedGenerator.cxx @@ -885,7 +885,8 @@ cmGlobalVisualStudioVersionedGenerator::FindAuxToolset( return AuxToolset::PropsMissing; } -bool cmGlobalVisualStudioVersionedGenerator::InitializeWindows(cmMakefile* mf) +bool cmGlobalVisualStudioVersionedGenerator::InitializePlatformWindows( + cmMakefile* mf) { // If the Win 8.1 SDK is installed then we can select a SDK matching // the target Windows version. @@ -896,7 +897,7 @@ bool cmGlobalVisualStudioVersionedGenerator::InitializeWindows(cmMakefile* mf) this->SetWindowsTargetPlatformVersion("8.1", mf); return true; } - return cmGlobalVisualStudio14Generator::InitializeWindows(mf); + return cmGlobalVisualStudio14Generator::InitializePlatformWindows(mf); } // Otherwise we must choose a Win 10 SDK even if we are not targeting // Windows 10. |