[Cmake-commits] CMake branch, next, updated. v2.8.2-771-g595e3ea

David Cole david.cole at kitware.com
Tue Sep 14 10:41:19 EDT 2010


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  595e3ea27c958237249300e9aab73d7a849ac63d (commit)
       via  9b4ab06c2c46244c158b4349f1b2865f44a11a42 (commit)
      from  2a3134388e36616cf34cbb378e9ebfb6b6634475 (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=595e3ea27c958237249300e9aab73d7a849ac63d
commit 595e3ea27c958237249300e9aab73d7a849ac63d
Merge: 2a31343 9b4ab06
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Tue Sep 14 10:41:17 2010 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Sep 14 10:41:17 2010 -0400

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


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9b4ab06c2c46244c158b4349f1b2865f44a11a42
commit 9b4ab06c2c46244c158b4349f1b2865f44a11a42
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Tue Sep 14 10:36:43 2010 -0400
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Tue Sep 14 10:36:43 2010 -0400

    Avoid CustomCommand test failure on VS71 (#9963)
    
    The new first arg in the test is the critical one
    to prove that the new NMake specific code works.
    The additional colons in the middle of the arg
    stream work fine everywhere else, but not on
    dash1.kitware with Visual Studio 7.1. Just avoid
    the failure for now by removing the unnecessary
    new args from the test.

diff --git a/Tests/CustomCommand/CMakeLists.txt b/Tests/CustomCommand/CMakeLists.txt
index c6f6a7f..d2a0cf7 100644
--- a/Tests/CustomCommand/CMakeLists.txt
+++ b/Tests/CustomCommand/CMakeLists.txt
@@ -278,8 +278,6 @@ SET(CHECK_ARGS
   |nopipe
   "#two-pounds#"
   "one#pound"
-  ":two-colons:"
-  "one:colon"
   "#nocomment"
   "c:/posix/path/with space"
   "c:\\windows\\path\\with space"

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

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


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list