[Cmake-commits] CMake branch, next, updated. v3.7.0-rc1-433-gc481462

[Brad King]

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  c481462afca694c44b0405042195bfc4ba032e79 (commit)
       via  ff9ecb35546cab4421e66493156f14dba345236f (commit)
      from  605a85bd1cfb5601c9ec77cf9e45019f9faf23a2 (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=c481462afca694c44b0405042195bfc4ba032e79
commit c481462afca694c44b0405042195bfc4ba032e79
Merge: 605a85b ff9ecb3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 13 08:57:20 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 13 08:57:20 2016 -0400

    Merge topic 'vs-host-x64-tools' into next
    
    ff9ecb35 fixup! VS: Provide an option to use x64 host tools


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ff9ecb35546cab4421e66493156f14dba345236f
commit ff9ecb35546cab4421e66493156f14dba345236f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 13 08:56:26 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 13 08:56:26 2016 -0400

    fixup! VS: Provide an option to use x64 host tools

diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 75fc2e4..0ddfc9a 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -220,6 +220,19 @@ bool cmGlobalXCodeGenerator::SetGeneratorToolset(std::string const& ts,
                                                  cmMakefile* mf)
 {
   if (this->XcodeVersion >= 30) {
+    if (ts.find_first_of(",=") != ts.npos) {
+      std::ostringstream e;
+      /* clang-format off */
+      e <<
+        "Generator\n"
+        "  " << this->GetName() << "\n"
+        "does not recognize the toolset\n"
+        "  " << ts << "\n"
+        "that was specified.";
+      /* clang-format on */
+      mf->IssueMessage(cmake::FATAL_ERROR, e.str());
+      return false;
+    }
     this->GeneratorToolset = ts;
     if (!this->GeneratorToolset.empty()) {
       mf->AddDefinition("CMAKE_XCODE_PLATFORM_TOOLSET",

-----------------------------------------------------------------------

Summary of changes:
 Source/cmGlobalXCodeGenerator.cxx |   13 +++++++++++++
 1 file changed, 13 insertions(+)


hooks/post-receive
-- 
CMake