diff options
| author | Brad King <brad.king@kitware.com> | 2017-07-13 12:23:52 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-07-13 12:23:56 (GMT) |
| commit | aa97170f2b25a99d2cc69fd6b2a059e52872f341 (patch) | |
| tree | 49e4448e81c940432339e806008e87bfbd6246bc | |
| parent | a4a39a46c34c1227be999eb10dd39ddeb70ada7b (diff) | |
| parent | 80f59ee6028aaaa9019e3d1eac0c018039a7f22a (diff) | |
| download | CMake-aa97170f2b25a99d2cc69fd6b2a059e52872f341.zip CMake-aa97170f2b25a99d2cc69fd6b2a059e52872f341.tar.gz CMake-aa97170f2b25a99d2cc69fd6b2a059e52872f341.tar.bz2 | |
Merge topic 'win10-sdk-request-mismatch'
80f59ee6 cmGlobalVisualStudio14Generator: notify when the SDK version doesn't match
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !866
| -rw-r--r-- | Source/cmGlobalVisualStudio14Generator.cxx | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Source/cmGlobalVisualStudio14Generator.cxx b/Source/cmGlobalVisualStudio14Generator.cxx index c8cf02c..e2120b8 100644 --- a/Source/cmGlobalVisualStudio14Generator.cxx +++ b/Source/cmGlobalVisualStudio14Generator.cxx @@ -151,6 +151,13 @@ bool cmGlobalVisualStudio14Generator::SelectWindows10SDK(cmMakefile* mf, mf->IssueMessage(cmake::FATAL_ERROR, e.str()); return false; } + if (!cmSystemTools::VersionCompareEqual(this->WindowsTargetPlatformVersion, + this->SystemVersion)) { + std::ostringstream e; + e << "Selecting Windows SDK version " << this->WindowsTargetPlatformVersion + << " to target Windows " << this->SystemVersion << "."; + mf->DisplayStatus(e.str().c_str(), -1); + } mf->AddDefinition("CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION", this->WindowsTargetPlatformVersion.c_str()); return true; |