[Cmake-commits] CMake branch, next, updated. v2.8.12-4626-geb6bd9a

[Brad King]

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  eb6bd9af6308918d3958553bed6910ef3cfdced6 (commit)
       via  8640e5297911df98521b2b835aa1c024adbf845e (commit)
       via  144068e270a5e99fb6c3e5dbea0eb94d0bd8fd79 (commit)
      from  3ea2128640d59859045809e29ee4df9f14e4307c (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=eb6bd9af6308918d3958553bed6910ef3cfdced6
commit eb6bd9af6308918d3958553bed6910ef3cfdced6
Merge: 3ea2128 8640e52
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 29 10:25:51 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 29 10:25:51 2013 -0400

    Merge topic 'cmake-syntax-test-escaped-comment' into next
    
    8640e52 Add to RunCMake.Syntax test \-escape cases
    144068e Add to RunCMake.Syntax test comments not separated by spaces


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8640e5297911df98521b2b835aa1c024adbf845e
commit 8640e5297911df98521b2b835aa1c024adbf845e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 29 10:21:50 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Oct 29 10:21:50 2013 -0400

    Add to RunCMake.Syntax test \-escape cases
    
    Add an Escape1 test case covering \-escape cases inside bracket, quoted,
    and unquoted arguments.  Also cover comments immediately after quoted
    and unquoted arguments on lines containing \# escapes.

diff --git a/Tests/RunCMake/Syntax/Escape1-stderr.txt b/Tests/RunCMake/Syntax/Escape1-stderr.txt
new file mode 100644
index 0000000..6601ce7
--- /dev/null
+++ b/Tests/RunCMake/Syntax/Escape1-stderr.txt
@@ -0,0 +1,3 @@
+^\\##\[\[#\]\]#\[\[\]\]x#\\"
+\$\@\^\\; 	\(\)#\\"
+\$\@\^; 	\(\)$
diff --git a/Tests/RunCMake/Syntax/Escape1.cmake b/Tests/RunCMake/Syntax/Escape1.cmake
new file mode 100644
index 0000000..3bf801e
--- /dev/null
+++ b/Tests/RunCMake/Syntax/Escape1.cmake
@@ -0,0 +1,3 @@
+message([[\#]] \#[[ \#]] "#[[]]" x#comment
+  "\#\\\"\n\$\@\^\;\ \t\(\)"#comment
+   \#\\\"\n\$\@\^\;\ \t\(\))
diff --git a/Tests/RunCMake/Syntax/RunCMakeTest.cmake b/Tests/RunCMake/Syntax/RunCMakeTest.cmake
index 2d49f76..4f42a07 100644
--- a/Tests/RunCMake/Syntax/RunCMakeTest.cmake
+++ b/Tests/RunCMake/Syntax/RunCMakeTest.cmake
@@ -39,6 +39,7 @@ run_cmake(BracketNoSpace2)
 run_cmake(BracketNoSpace3)
 run_cmake(BracketNoSpace4)
 run_cmake(BracketNoSpace5)
+run_cmake(Escape1)
 run_cmake(ParenNoSpace0)
 run_cmake(ParenNoSpace1)
 run_cmake(ParenNoSpace2)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=144068e270a5e99fb6c3e5dbea0eb94d0bd8fd79
commit 144068e270a5e99fb6c3e5dbea0eb94d0bd8fd79
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 29 09:55:43 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Oct 29 09:55:43 2013 -0400

    Add to RunCMake.Syntax test comments not separated by spaces
    
    Extend the BracketComment5 test case to cover both bracket comments and
    line comments starting immediately after a bracket comment closes.

diff --git a/Tests/RunCMake/Syntax/BracketComment5.cmake b/Tests/RunCMake/Syntax/BracketComment5.cmake
index bb6d9f3..dc9e6b4 100644
--- a/Tests/RunCMake/Syntax/BracketComment5.cmake
+++ b/Tests/RunCMake/Syntax/BracketComment5.cmake
@@ -2,5 +2,10 @@
 message(FATAL_ERROR "This is commented out.")
 #]] #[[
 message(FATAL_ERROR "This is commented out.")
+#]]#[[
+message(FATAL_ERROR "This is commented out.")
 #]] #message(FATAL_ERROR "This is commented out.")
+#[[
+message(FATAL_ERROR "This is commented out.")
+#]]#message(FATAL_ERROR "This is commented out.")
 message(STATUS "The above FATAL_ERROR did not occur.")

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

Summary of changes:
 Tests/RunCMake/Syntax/BracketComment5.cmake |    5 +++++
 Tests/RunCMake/Syntax/Escape1-stderr.txt    |    3 +++
 Tests/RunCMake/Syntax/Escape1.cmake         |    3 +++
 Tests/RunCMake/Syntax/RunCMakeTest.cmake    |    1 +
 4 files changed, 12 insertions(+), 0 deletions(-)
 create mode 100644 Tests/RunCMake/Syntax/Escape1-stderr.txt
 create mode 100644 Tests/RunCMake/Syntax/Escape1.cmake


hooks/post-receive
-- 
CMake