[Cmake-commits] CMake branch, next, updated. v2.8.2-849-gc2c5534

[David Cole]

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  c2c5534f1888606b9ef6ac0bbe9c78a66f9a4af2 (commit)
       via  a798bb7074dd45e4e375a3df69d08f62a17ab2ab (commit)
      from  3b8d74b9326df8d03163b349d7ccbd4c7cd4aa8c (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=c2c5534f1888606b9ef6ac0bbe9c78a66f9a4af2
commit c2c5534f1888606b9ef6ac0bbe9c78a66f9a4af2
Merge: 3b8d74b a798bb7
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Mon Sep 20 13:38:40 2010 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Sep 20 13:38:40 2010 -0400

    Merge topic 'fix-9963' into next
    
    a798bb7 Avoid CustomCommand test failure on VS71 (#9963)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a798bb7074dd45e4e375a3df69d08f62a17ab2ab
commit a798bb7074dd45e4e375a3df69d08f62a17ab2ab
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Mon Sep 20 13:20:15 2010 -0400
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Mon Sep 20 13:20:15 2010 -0400

    Avoid CustomCommand test failure on VS71 (#9963)
    
    Test still failing on dash1.kitware. Give up on testing
    the new arg on MSVC71. Test it with newer nmakes instead.
    All other dashboards are fine with -DPATH=c:/posix/path
    as the first arg, so keep it except when MSVC71 is true.

diff --git a/Tests/CustomCommand/CMakeLists.txt b/Tests/CustomCommand/CMakeLists.txt
index d2a0cf7..76208d4 100644
--- a/Tests/CustomCommand/CMakeLists.txt
+++ b/Tests/CustomCommand/CMakeLists.txt
@@ -224,8 +224,12 @@ ADD_CUSTOM_COMMAND(OUTPUT gen_redirect.c
 ##############################################################################
 # Test non-trivial command line arguments in custom commands.
 SET(EXPECTED_ARGUMENTS)
+SET(CHECK_ARGS)
+IF(NOT MSVC71)
+  SET(CHECK_ARGS -DPATH=c:/posix/path)
+ENDIF()
 SET(CHECK_ARGS
-  -DPATH=c:/posix/path
+  ${CHECK_ARGS}
   c:/posix/path
   c:\\windows\\path
   'single-quotes'

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

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


hooks/post-receive
-- 
CMake