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/cmGlobalVisualStudio14Generator.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/cmGlobalVisualStudio14Generator.cxx')
| -rw-r--r-- | Source/cmGlobalVisualStudio14Generator.cxx | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/Source/cmGlobalVisualStudio14Generator.cxx b/Source/cmGlobalVisualStudio14Generator.cxx index 4b59b16..87c8a5e 100644 --- a/Source/cmGlobalVisualStudio14Generator.cxx +++ b/Source/cmGlobalVisualStudio14Generator.cxx @@ -137,7 +137,7 @@ bool cmGlobalVisualStudio14Generator::MatchesGeneratorName( return false; } -bool cmGlobalVisualStudio14Generator::InitializeWindows(cmMakefile* mf) +bool cmGlobalVisualStudio14Generator::InitializePlatformWindows(cmMakefile* mf) { if (cmHasLiteralPrefix(this->SystemVersion, "10.0")) { return this->SelectWindows10SDK(mf); @@ -162,9 +162,6 @@ bool cmGlobalVisualStudio14Generator::InitializeWindowsStore(cmMakefile* mf) mf->IssueMessage(MessageType::FATAL_ERROR, e.str()); return false; } - if (cmHasLiteralPrefix(this->SystemVersion, "10.0")) { - return this->SelectWindows10SDK(mf); - } return true; } |