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, next has been updated
via ca59b4beca14ce465fc68cedeb3ab83c279de8fe (commit)
via 8d67c7badf1233ca22e8b1d5ea20da137dba440e (commit)
via a1e1320a5090c52a65ec1592c283efd062645f83 (commit)
from 0c8e9841b6660516b56e27589a02569c4c71e0d1 (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=ca59b4beca14ce465fc68cedeb3ab83c279de8fe
commit ca59b4beca14ce465fc68cedeb3ab83c279de8fe
Merge: 0c8e984 8d67c7b
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Dec 7 10:53:04 2016 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Wed Dec 7 10:53:04 2016 -0500
Merge topic 'vs-fix-standalone-Windows7.1SDK-toolset' into next
8d67c7ba VS: Fix standalone Windows7.1SDK toolset selection
a1e1320a VS: Refactor VS 2010 Express Edition 64-bit tool lookup
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8d67c7badf1233ca22e8b1d5ea20da137dba440e
commit 8d67c7badf1233ca22e8b1d5ea20da137dba440e
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Dec 7 10:38:18 2016 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Wed Dec 7 10:45:38 2016 -0500
VS: Fix standalone Windows7.1SDK toolset selection
Since commit v3.7.0-rc1~142^2~1 (VS: Explicitly default to v100 toolset
in Visual Studio 2010, 2016-07-21) we prefer to always set a platform
toolset explicitly so that `CMAKE_VS_PLATFORM_TOOLSET` can be reported.
However, the `v100` default for the VS 10 generator is not appropriate
for all environments. We fixed support for VS 2010 Express Edition in
commit v3.7.0-rc1~142^2 (VS: Do not default to missing v100 64-bit
toolset on VS 2010 Express, 2016-09-09).
Fix support for the standalone Windows7.1SDK toolset environment by
recognizing the `PlatformToolset` environment variable that it sets to
`Windows7.1SDK` and using this as our default toolset instead.
Closes: #16483
diff --git a/Source/cmGlobalVisualStudio10Generator.cxx
b/Source/cmGlobalVisualStudio10Generator.cxx
index 24c6528..a1e328e 100644
--- a/Source/cmGlobalVisualStudio10Generator.cxx
+++ b/Source/cmGlobalVisualStudio10Generator.cxx
@@ -474,7 +474,12 @@ void cmGlobalVisualStudio10Generator::GenerateBuildCommand(
bool cmGlobalVisualStudio10Generator::Find64BitTools(cmMakefile* mf)
{
if (this->DefaultPlatformToolset == "v100") {
- if (this->IsExpressEdition()) {
+ std::string env;
+ if (cmSystemTools::GetEnv("PlatformToolset", env) &&
+ env == "Windows7.1SDK") {
+ // We are running from a Windows7.1SDK command prompt.
+ this->DefaultPlatformToolset = "Windows7.1SDK";
+ } else if (this->IsExpressEdition()) {
// The v100 64-bit toolset does not exist in the express edition.
this->DefaultPlatformToolset.clear();
}
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a1e1320a5090c52a65ec1592c283efd062645f83
commit a1e1320a5090c52a65ec1592c283efd062645f83
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Dec 7 10:36:18 2016 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Wed Dec 7 10:40:33 2016 -0500
VS: Refactor VS 2010 Express Edition 64-bit tool lookup
Move the `IsExpressEdition` check into the `Find64BitTools` method in
order to be able to later add alternative default toolset selection.
diff --git a/Source/cmGlobalVisualStudio10Generator.cxx
b/Source/cmGlobalVisualStudio10Generator.cxx
index caaac87..24c6528 100644
--- a/Source/cmGlobalVisualStudio10Generator.cxx
+++ b/Source/cmGlobalVisualStudio10Generator.cxx
@@ -126,7 +126,7 @@ bool cmGlobalVisualStudio10Generator::SetGeneratorPlatform(
}
if (this->GetPlatformName() == "Itanium" ||
this->GetPlatformName() == "x64") {
- if (this->IsExpressEdition() && !this->Find64BitTools(mf)) {
+ if (!this->Find64BitTools(mf)) {
return false;
}
}
@@ -474,10 +474,14 @@ void
cmGlobalVisualStudio10Generator::GenerateBuildCommand(
bool cmGlobalVisualStudio10Generator::Find64BitTools(cmMakefile* mf)
{
if (this->DefaultPlatformToolset == "v100") {
- // The v100 64-bit toolset does not exist in the express edition.
- this->DefaultPlatformToolset.clear();
+ if (this->IsExpressEdition()) {
+ // The v100 64-bit toolset does not exist in the express edition.
+ this->DefaultPlatformToolset.clear();
+ }
}
- if (this->GetPlatformToolset()) {
+ // Find the Windows7.1SDK tools when using the express edition
+ // and no specified or default toolset has been selected.
+ if (!this->IsExpressEdition() || this->GetPlatformToolset()) {
return true;
}
// This edition does not come with 64-bit tools. Look for them.
-----------------------------------------------------------------------
Summary of changes:
Source/cmGlobalVisualStudio10Generator.cxx | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
