[Cmake-commits] CMake branch, next, updated. v2.8.11-2504-ga0767f4

[Stephen Kelly]

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  a0767f43b9697750e4a3056e26f23b99d5924f0f (commit)
       via  521c3e8764445ec72cb90076d196a2eb5f4e674f (commit)
      from  ba5789d8de124378c21a5dccea34953fb65b0dc3 (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=a0767f43b9697750e4a3056e26f23b99d5924f0f
commit a0767f43b9697750e4a3056e26f23b99d5924f0f
Merge: ba5789d 521c3e8
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Jun 4 06:38:43 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jun 4 06:38:43 2013 -0400

    Merge topic 'suppress-unused-cli-with-value-in-cache' into next
    
    521c3e8 Only run the CliUnused test with the Makefiles generator.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=521c3e8764445ec72cb90076d196a2eb5f4e674f
commit 521c3e8764445ec72cb90076d196a2eb5f4e674f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Jun 4 12:37:57 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Jun 4 12:37:57 2013 +0200

    Only run the CliUnused test with the Makefiles generator.

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index b005dca..a91eac7 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1618,9 +1618,12 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
     FAIL_REGULAR_EXPRESSION "CMake Warning .*VariableUnusedViaUnset.CMakeLists.txt:5 \\(set\\):")
   list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/WarnUnusedUnusedViaUnset")
 
-  if (NOT CMAKE_TEST_GENERATOR MATCHES "Ninja")
+  if("${CMAKE_TEST_GENERATOR}" MATCHES "Makefile")
     # Ninja does not support ADDITIONAL_MAKE_CLEAN_FILES and therefore fails
     # this test. (See #13371)
+    # Apparently Visual Studio does not support it either. As the MakeClean
+    # test above is only run with the Makefiles generator, only run this
+    # test with the Makefiles generator also.
     add_test(WarnUnusedCliUnused ${CMAKE_CTEST_COMMAND}
       --build-and-test
       "${CMake_SOURCE_DIR}/Tests/WarnUnusedCliUnused"

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

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


hooks/post-receive
-- 
CMake