[Cmake-commits] CMake branch, next, updated. v3.8.0-rc1-157-gc497701

[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  c4977015291e195193f0e529d86ebc039e009907 (commit)
       via  db86099f386b59ed8fe0b66d1956454de14aede8 (commit)
      from  60c0bb2d4a7390ce63237da1b6a3d5dfcc79bab6 (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=c4977015291e195193f0e529d86ebc039e009907
commit c4977015291e195193f0e529d86ebc039e009907
Merge: 60c0bb2 db86099
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 15 08:16:43 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 15 08:16:43 2017 -0500

    Merge topic 'vs-refactor-toolset-parsing' into next
    
    db86099f fixup! VS: Refactor generator toolset parsing


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=db86099f386b59ed8fe0b66d1956454de14aede8
commit db86099f386b59ed8fe0b66d1956454de14aede8
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 15 08:10:11 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 15 08:10:11 2017 -0500

    fixup! VS: Refactor generator toolset parsing

diff --git a/Tests/RunCMake/GeneratorToolset/BadToolsetHostArchXcode-result.txt b/Tests/RunCMake/GeneratorToolset/BadToolsetHostArchXcode-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/GeneratorToolset/BadToolsetHostArchXcode-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/GeneratorToolset/BadToolsetHostArchXcode-stderr.txt b/Tests/RunCMake/GeneratorToolset/BadToolsetHostArchXcode-stderr.txt
new file mode 100644
index 0000000..5737e95
--- /dev/null
+++ b/Tests/RunCMake/GeneratorToolset/BadToolsetHostArchXcode-stderr.txt
@@ -0,0 +1,10 @@
+CMake Error at CMakeLists.txt:[0-9]+ \(project\):
+  Generator
+
+    .*
+
+  does not recognize the toolset
+
+    Test Toolset,host=x6[45]
+
+  that was specified\.$
diff --git a/Tests/RunCMake/GeneratorToolset/BadToolsetHostArchXcode.cmake b/Tests/RunCMake/GeneratorToolset/BadToolsetHostArchXcode.cmake
new file mode 100644
index 0000000..2fc38e5
--- /dev/null
+++ b/Tests/RunCMake/GeneratorToolset/BadToolsetHostArchXcode.cmake
@@ -0,0 +1 @@
+message(FATAL_ERROR "This should not be reached!")
diff --git a/Tests/RunCMake/GeneratorToolset/RunCMakeTest.cmake b/Tests/RunCMake/GeneratorToolset/RunCMakeTest.cmake
index 902569d..44c67a2 100644
--- a/Tests/RunCMake/GeneratorToolset/RunCMakeTest.cmake
+++ b/Tests/RunCMake/GeneratorToolset/RunCMakeTest.cmake
@@ -3,7 +3,7 @@ include(RunCMake)
 set(RunCMake_GENERATOR_TOOLSET "")
 run_cmake(NoToolset)
 
-if("${RunCMake_GENERATOR}" MATCHES "Visual Studio 1[01245]|Xcode" AND NOT XCODE_BELOW_3)
+if("${RunCMake_GENERATOR}" MATCHES "Visual Studio 1[01245]")
   set(RunCMake_GENERATOR_TOOLSET "Test Toolset")
   run_cmake(TestToolset)
   if("${RunCMake_GENERATOR}" MATCHES "Visual Studio 1[245]")
@@ -25,6 +25,11 @@ if("${RunCMake_GENERATOR}" MATCHES "Visual Studio 1[01245]|Xcode" AND NOT XCODE_
   endif()
   set(RunCMake_GENERATOR_TOOLSET "Test Toolset,not_a_key")
   run_cmake(BadToolsetFormat)
+elseif("${RunCMake_GENERATOR}" STREQUAL "Xcode" AND NOT XCODE_BELOW_3)
+  set(RunCMake_GENERATOR_TOOLSET "Test Toolset")
+  run_cmake(TestToolset)
+  set(RunCMake_GENERATOR_TOOLSET "Test Toolset,host=x64")
+  run_cmake(BadToolsetHostArchXcode)
 else()
   set(RunCMake_GENERATOR_TOOLSET "Bad Toolset")
   run_cmake(BadToolset)

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

Summary of changes:
 .../BadToolsetHostArchXcode-result.txt}                         |    0
 ...etHostArch-stderr.txt => BadToolsetHostArchXcode-stderr.txt} |    4 ++--
 .../BadToolsetHostArchXcode.cmake}                              |    0
 Tests/RunCMake/GeneratorToolset/RunCMakeTest.cmake              |    7 ++++++-
 4 files changed, 8 insertions(+), 3 deletions(-)
 copy Tests/RunCMake/{Android/BadSYSROOT-result.txt => GeneratorToolset/BadToolsetHostArchXcode-result.txt} (100%)
 copy Tests/RunCMake/GeneratorToolset/{BadToolsetHostArch-stderr.txt => BadToolsetHostArchXcode-stderr.txt} (56%)
 copy Tests/RunCMake/{GeneratorPlatform/BadPlatform.cmake => GeneratorToolset/BadToolsetHostArchXcode.cmake} (100%)


hooks/post-receive
-- 
CMake