This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, master has been updated
via aa97170f2b25a99d2cc69fd6b2a059e52872f341 (commit)
via 80f59ee6028aaaa9019e3d1eac0c018039a7f22a (commit)
from a4a39a46c34c1227be999eb10dd39ddeb70ada7b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aa97170f2b25a99d2cc69fd6b2a059e52872f341
commit aa97170f2b25a99d2cc69fd6b2a059e52872f341
Merge: a4a39a4 80f59ee
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Jul 13 12:23:52 2017 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Thu Jul 13 08:23:56 2017 -0400
Merge topic 'win10-sdk-request-mismatch'
80f59ee6 cmGlobalVisualStudio14Generator: notify when the SDK version
doesn't match
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !866
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=80f59ee6028aaaa9019e3d1eac0c018039a7f22a
commit 80f59ee6028aaaa9019e3d1eac0c018039a7f22a
Author: Ben Boeckel <ben.boec...@kitware.com>
AuthorDate: Wed May 17 14:23:53 2017 -0400
Commit: Ben Boeckel <ben.boec...@kitware.com>
CommitDate: Thu Jul 13 08:10:57 2017 -0400
cmGlobalVisualStudio14Generator: notify when the SDK version doesn't match
When requesting an SDK version which is not suitable (e.g., missing
`windows.h`), CMake will use the next-best SDK version. Output a message
when CMake chooses something different than the requested SDK version.
See #16895.
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;
-----------------------------------------------------------------------
Summary of changes:
Source/cmGlobalVisualStudio14Generator.cxx | 7 +++++++
1 file changed, 7 insertions(+)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
