[Cmake-commits] CMake branch, next, updated. v2.8.11-1959-g5f82d4d

[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  5f82d4dbce2995d16b832c1e0de548916698bc0b (commit)
       via  2a67dbc230c1298e1582004f42bd73267384a295 (commit)
      from  30591885d492bbeea8aaeafa045878b7f5fbfa4e (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5f82d4dbce2995d16b832c1e0de548916698bc0b
commit 5f82d4dbce2995d16b832c1e0de548916698bc0b
Merge: 3059188 2a67dbc
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu May 16 13:06:46 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu May 16 13:06:46 2013 -0400

    Merge topic 'vs-windows-forms' into next
    
    2a67dbc VS: Run VSWindowsFormsResx test only with normal toolset


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2a67dbc230c1298e1582004f42bd73267384a295
commit 2a67dbc230c1298e1582004f42bd73267384a295
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu May 16 13:03:44 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu May 16 13:04:40 2013 -0400

    VS: Run VSWindowsFormsResx test only with normal toolset
    
    If CMAKE_TEST_GENERATOR_TOOLSET is set then the test toolset may
    not support Windows Forms even though the default toolset does.

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 434daf1..21c9490 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1448,7 +1448,8 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
       ADD_TEST_MACRO(SBCS SBCS)
     endif()
 
-    if(NOT "${CMAKE_TEST_GENERATOR}" MATCHES "Visual Studio [6789]( |$)")
+    if(NOT "${CMAKE_TEST_GENERATOR}" MATCHES "Visual Studio [6789]( |$)"
+        AND NOT CMAKE_TEST_GENERATOR_TOOLSET)
       ADD_TEST_MACRO(VSWindowsFormsResx VSWindowsFormsResx)
     endif()
 

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

Summary of changes:
 Tests/CMakeLists.txt |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake