[Cmake-commits] CMake branch, next, updated. v2.8.11.1-2612-gf9402d8

[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  f9402d8b1596493374372ebf04a6c07620ae277f (commit)
       via  6a6cda5b4a0fe561cc5f5b7d6ec12775d17a4457 (commit)
      from  2d8245cbae9007976570b903d5cb185166e397f1 (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=f9402d8b1596493374372ebf04a6c07620ae277f
commit f9402d8b1596493374372ebf04a6c07620ae277f
Merge: 2d8245c 6a6cda5
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Jun 12 11:25:29 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jun 12 11:25:29 2013 -0400

    Merge topic 'suppress-unused-cli-with-value-in-cache' into next
    
    6a6cda5 Don't run the WarnUnusedCliUnused test on Windows.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6a6cda5b4a0fe561cc5f5b7d6ec12775d17a4457
commit 6a6cda5b4a0fe561cc5f5b7d6ec12775d17a4457
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Jun 12 17:21:10 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Jun 12 17:21:10 2013 +0200

    Don't run the WarnUnusedCliUnused test on Windows.
    
    Even with the NMake Makefiles generator, it is not able to properly
    clean up after the test.
    
     http://open.cdash.org/testDetails.php?test=193424220&build=2934501
    
     Internal cmake changing into directory: C:/Dashboards/My Tests/CMake-nmake10-x64-continuous/Tests/WarnUnusedCliUnused
     Error: cmake execution failed
     CMake Error: Error: generator : NMake Makefiles
     Does not match the generator used previously: Visual Studio 10
     Either remove the CMakeCache.txt file or choose a different binary directory.

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index a91eac7..57b33ad 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1618,7 +1618,7 @@ ${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("${CMAKE_TEST_GENERATOR}" MATCHES "Makefile")
+  if("${CMAKE_TEST_GENERATOR}" MATCHES "Makefile" AND NOT WIN32)
     # 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

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

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


hooks/post-receive
-- 
CMake