[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-2809-g9ae2052

[Ben Boeckel]

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  9ae20522b7afa771d9ecf23e05d42b0e85da636a (commit)
       via  c11d74bd02d0c529f74162d92d5b36bb500c4cb4 (commit)
      from  a1bcadbc7951500cf2116d49495fb385ea5ee8a3 (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=9ae20522b7afa771d9ecf23e05d42b0e85da636a
commit 9ae20522b7afa771d9ecf23e05d42b0e85da636a
Merge: a1bcadb c11d74b
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Tue May 6 14:14:33 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue May 6 14:14:33 2014 -0400

    Merge topic 'dev/faster-evis' into next
    
    c11d74bd tests: fix carriage return tests


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c11d74bd02d0c529f74162d92d5b36bb500c4cb4
commit c11d74bd02d0c529f74162d92d5b36bb500c4cb4
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Tue May 6 14:20:28 2014 -0400
Commit:     Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Tue May 6 14:20:28 2014 -0400

    tests: fix carriage return tests

diff --git a/Tests/RunCMake/Syntax/NameWithCarriageReturnQuoted-stderr.txt b/Tests/RunCMake/Syntax/NameWithCarriageReturnQuoted-stderr.txt
index 97bc4b6..d93b9db 100644
--- a/Tests/RunCMake/Syntax/NameWithCarriageReturnQuoted-stderr.txt
+++ b/Tests/RunCMake/Syntax/NameWithCarriageReturnQuoted-stderr.txt
@@ -5,7 +5,7 @@
 
   when parsing string
 
-    \${var
with
carriagereturn}
+    \${var\\rwith\\rcarriagereturn}
 
   syntax error, unexpected cal_SYMBOL, expecting } \(26\)
 Call Stack \(most recent call first\):
diff --git a/Tests/RunCMake/Syntax/NameWithCarriageReturnQuoted.cmake b/Tests/RunCMake/Syntax/NameWithCarriageReturnQuoted.cmake
index 5378865..bac69e4 100644
--- a/Tests/RunCMake/Syntax/NameWithCarriageReturnQuoted.cmake
+++ b/Tests/RunCMake/Syntax/NameWithCarriageReturnQuoted.cmake
@@ -1 +1 @@
-message("${var
with
carriagereturn}")
+message("${var\rwith\rcarriagereturn}")

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

Summary of changes:
 Tests/RunCMake/Syntax/NameWithCarriageReturnQuoted-stderr.txt |    2 +-
 Tests/RunCMake/Syntax/NameWithCarriageReturnQuoted.cmake      |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake