[Cmake-commits] CMake branch, next, updated. v3.3.0-rc3-856-g22c6064
Brad King
brad.king at kitware.com
Mon Jul 6 11:22:21 EDT 2015
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 22c6064708add4d69d70a0232a27561e89f64c89 (commit)
via ab47821433d5cd164a50e6c8468af5b1798b644a (commit)
from 5b6816a64e60b34252afeea13ffe122044a60f13 (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=22c6064708add4d69d70a0232a27561e89f64c89
commit 22c6064708add4d69d70a0232a27561e89f64c89
Merge: 5b6816a ab47821
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Jul 6 11:22:20 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jul 6 11:22:20 2015 -0400
Merge topic 'refactor-cmListFileBacktrace' into next
ab478214 fixup! cmMakefile: Create a scoped context for parsing listfiles.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ab47821433d5cd164a50e6c8468af5b1798b644a
commit ab47821433d5cd164a50e6c8468af5b1798b644a
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Jul 6 11:19:35 2015 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Jul 6 11:19:35 2015 -0400
fixup! cmMakefile: Create a scoped context for parsing listfiles.
diff --git a/Tests/RunCMake/Syntax/BOM-UTF-16-BE-stderr.txt b/Tests/RunCMake/Syntax/BOM-UTF-16-BE-stderr.txt
index 606b5bb..a845ffb 100644
--- a/Tests/RunCMake/Syntax/BOM-UTF-16-BE-stderr.txt
+++ b/Tests/RunCMake/Syntax/BOM-UTF-16-BE-stderr.txt
@@ -1,7 +1,7 @@
CMake Error in BOM-UTF-16-BE.cmake:
File
- .*Tests/RunCMake/Syntax/BOM-UTF-16-BE.cmake
+ .*/Tests/RunCMake/Syntax/BOM-UTF-16-BE.cmake
starts with a Byte-Order-Mark that is not UTF-8.
Call Stack \(most recent call first\):
diff --git a/Tests/RunCMake/Syntax/BOM-UTF-16-LE-stderr.txt b/Tests/RunCMake/Syntax/BOM-UTF-16-LE-stderr.txt
index 25c14f3..cc4244b 100644
--- a/Tests/RunCMake/Syntax/BOM-UTF-16-LE-stderr.txt
+++ b/Tests/RunCMake/Syntax/BOM-UTF-16-LE-stderr.txt
@@ -1,7 +1,7 @@
CMake Error in BOM-UTF-16-LE.cmake:
File
- .*Tests/RunCMake/Syntax/BOM-UTF-16-LE.cmake
+ .*/Tests/RunCMake/Syntax/BOM-UTF-16-LE.cmake
starts with a Byte-Order-Mark that is not UTF-8.
Call Stack \(most recent call first\):
diff --git a/Tests/RunCMake/Syntax/BOM-UTF-32-BE-stderr.txt b/Tests/RunCMake/Syntax/BOM-UTF-32-BE-stderr.txt
index 7244bf4..5f851bf 100644
--- a/Tests/RunCMake/Syntax/BOM-UTF-32-BE-stderr.txt
+++ b/Tests/RunCMake/Syntax/BOM-UTF-32-BE-stderr.txt
@@ -1,7 +1,7 @@
CMake Error in BOM-UTF-32-BE.cmake:
File
- .*Tests/RunCMake/Syntax/BOM-UTF-32-BE.cmake
+ .*/Tests/RunCMake/Syntax/BOM-UTF-32-BE.cmake
starts with a Byte-Order-Mark that is not UTF-8.
Call Stack \(most recent call first\):
diff --git a/Tests/RunCMake/Syntax/BOM-UTF-32-LE-stderr.txt b/Tests/RunCMake/Syntax/BOM-UTF-32-LE-stderr.txt
index ac59c24..d8fafd0 100644
--- a/Tests/RunCMake/Syntax/BOM-UTF-32-LE-stderr.txt
+++ b/Tests/RunCMake/Syntax/BOM-UTF-32-LE-stderr.txt
@@ -1,7 +1,7 @@
CMake Error in BOM-UTF-32-LE.cmake:
File
- .*Tests/RunCMake/Syntax/BOM-UTF-32-LE.cmake
+ .*/Tests/RunCMake/Syntax/BOM-UTF-32-LE.cmake
starts with a Byte-Order-Mark that is not UTF-8.
Call Stack \(most recent call first\):
diff --git a/Tests/RunCMake/Syntax/BracketNoSpace0-stderr.txt b/Tests/RunCMake/Syntax/BracketNoSpace0-stderr.txt
index b9f132c..a288280 100644
--- a/Tests/RunCMake/Syntax/BracketNoSpace0-stderr.txt
+++ b/Tests/RunCMake/Syntax/BracketNoSpace0-stderr.txt
@@ -1,7 +1,7 @@
CMake Error in BracketNoSpace0.cmake:
Syntax Error in cmake code at
- .*Tests/RunCMake/Syntax/BracketNoSpace0.cmake:1:27
+ .*/Tests/RunCMake/Syntax/BracketNoSpace0.cmake:1:27
Argument not separated from preceding token by whitespace.
Call Stack \(most recent call first\):
diff --git a/Tests/RunCMake/Syntax/BracketNoSpace1-stderr.txt b/Tests/RunCMake/Syntax/BracketNoSpace1-stderr.txt
index aca9c35..391e11b 100644
--- a/Tests/RunCMake/Syntax/BracketNoSpace1-stderr.txt
+++ b/Tests/RunCMake/Syntax/BracketNoSpace1-stderr.txt
@@ -1,7 +1,7 @@
CMake Error in BracketNoSpace1.cmake:
Syntax Error in cmake code at
- .*Tests/RunCMake/Syntax/BracketNoSpace1.cmake:1:24
+ .*/Tests/RunCMake/Syntax/BracketNoSpace1.cmake:1:24
Argument not separated from preceding token by whitespace.
Call Stack \(most recent call first\):
diff --git a/Tests/RunCMake/Syntax/BracketNoSpace2-stderr.txt b/Tests/RunCMake/Syntax/BracketNoSpace2-stderr.txt
index ea37a7b..acaf7fe 100644
--- a/Tests/RunCMake/Syntax/BracketNoSpace2-stderr.txt
+++ b/Tests/RunCMake/Syntax/BracketNoSpace2-stderr.txt
@@ -1,7 +1,7 @@
CMake Error in BracketNoSpace2.cmake:
Syntax Error in cmake code at
- .*Tests/RunCMake/Syntax/BracketNoSpace2.cmake:1:44
+ .*/Tests/RunCMake/Syntax/BracketNoSpace2.cmake:1:44
Argument not separated from preceding token by whitespace.
Call Stack \(most recent call first\):
diff --git a/Tests/RunCMake/Syntax/BracketNoSpace3-stderr.txt b/Tests/RunCMake/Syntax/BracketNoSpace3-stderr.txt
index a4ee9d0..f12b2e5 100644
--- a/Tests/RunCMake/Syntax/BracketNoSpace3-stderr.txt
+++ b/Tests/RunCMake/Syntax/BracketNoSpace3-stderr.txt
@@ -1,7 +1,7 @@
CMake Error in BracketNoSpace3.cmake:
Syntax Error in cmake code at
- .*Tests/RunCMake/Syntax/BracketNoSpace3.cmake:1:45
+ .*/Tests/RunCMake/Syntax/BracketNoSpace3.cmake:1:45
Argument not separated from preceding token by whitespace.
Call Stack \(most recent call first\):
diff --git a/Tests/RunCMake/Syntax/BracketNoSpace4-stderr.txt b/Tests/RunCMake/Syntax/BracketNoSpace4-stderr.txt
index e36dbab..7157763 100644
--- a/Tests/RunCMake/Syntax/BracketNoSpace4-stderr.txt
+++ b/Tests/RunCMake/Syntax/BracketNoSpace4-stderr.txt
@@ -1,7 +1,7 @@
CMake Error in BracketNoSpace4.cmake:
Syntax Error in cmake code at
- .*Tests/RunCMake/Syntax/BracketNoSpace4.cmake:1:44
+ .*/Tests/RunCMake/Syntax/BracketNoSpace4.cmake:1:44
Argument not separated from preceding token by whitespace.
Call Stack \(most recent call first\):
diff --git a/Tests/RunCMake/Syntax/BracketNoSpace5-stderr.txt b/Tests/RunCMake/Syntax/BracketNoSpace5-stderr.txt
index 0ef8b13..c13969d 100644
--- a/Tests/RunCMake/Syntax/BracketNoSpace5-stderr.txt
+++ b/Tests/RunCMake/Syntax/BracketNoSpace5-stderr.txt
@@ -1,7 +1,7 @@
CMake Error in BracketNoSpace5.cmake:
Syntax Error in cmake code at
- .*Tests/RunCMake/Syntax/BracketNoSpace5.cmake:1:45
+ .*/Tests/RunCMake/Syntax/BracketNoSpace5.cmake:1:45
Argument not separated from preceding token by whitespace.
Call Stack \(most recent call first\):
diff --git a/Tests/RunCMake/Syntax/ParenInENV-stderr.txt b/Tests/RunCMake/Syntax/ParenInENV-stderr.txt
index d2c6b6f..37c5d6e 100644
--- a/Tests/RunCMake/Syntax/ParenInENV-stderr.txt
+++ b/Tests/RunCMake/Syntax/ParenInENV-stderr.txt
@@ -1,7 +1,7 @@
CMake Warning \(dev\) in ParenInENV.cmake:
Syntax Warning in cmake code at
- .*Tests/RunCMake/Syntax/ParenInENV.cmake:2:21
+ .*/Tests/RunCMake/Syntax/ParenInENV.cmake:2:21
Argument not separated from preceding token by whitespace.
Call Stack \(most recent call first\):
@@ -11,7 +11,7 @@ This warning is for project developers. Use -Wno-dev to suppress it.
CMake Error at ParenInENV.cmake:2 \(message\):
Syntax error in cmake code at
- .*Tests/RunCMake/Syntax/ParenInENV.cmake:2
+ .*/Tests/RunCMake/Syntax/ParenInENV.cmake:2
when parsing string
diff --git a/Tests/RunCMake/Syntax/ParenNoSpace1-stderr.txt b/Tests/RunCMake/Syntax/ParenNoSpace1-stderr.txt
index 97b1b71..45b2e6a 100644
--- a/Tests/RunCMake/Syntax/ParenNoSpace1-stderr.txt
+++ b/Tests/RunCMake/Syntax/ParenNoSpace1-stderr.txt
@@ -1,7 +1,7 @@
CMake Warning \(dev\) in ParenNoSpace1.cmake:
Syntax Warning in cmake code at
- .*Tests/RunCMake/Syntax/ParenNoSpace1.cmake:1:26
+ .*/Tests/RunCMake/Syntax/ParenNoSpace1.cmake:1:26
Argument not separated from preceding token by whitespace.
Call Stack \(most recent call first\):
@@ -11,7 +11,7 @@ This warning is for project developers. Use -Wno-dev to suppress it.
CMake Warning \(dev\) in ParenNoSpace1.cmake:
Syntax Warning in cmake code at
- .*Tests/RunCMake/Syntax/ParenNoSpace1.cmake:2:26
+ .*/Tests/RunCMake/Syntax/ParenNoSpace1.cmake:2:26
Argument not separated from preceding token by whitespace.
Call Stack \(most recent call first\):
@@ -21,7 +21,7 @@ This warning is for project developers. Use -Wno-dev to suppress it.
CMake Error in ParenNoSpace1.cmake:
Syntax Error in cmake code at
- .*Tests/RunCMake/Syntax/ParenNoSpace1.cmake:3:29
+ .*/Tests/RunCMake/Syntax/ParenNoSpace1.cmake:3:29
Argument not separated from preceding token by whitespace.
Call Stack \(most recent call first\):
diff --git a/Tests/RunCMake/Syntax/StringNoSpace-stderr.txt b/Tests/RunCMake/Syntax/StringNoSpace-stderr.txt
index d79a79b..a4ec6e7 100644
--- a/Tests/RunCMake/Syntax/StringNoSpace-stderr.txt
+++ b/Tests/RunCMake/Syntax/StringNoSpace-stderr.txt
@@ -1,7 +1,7 @@
CMake Warning \(dev\) in StringNoSpace.cmake:
Syntax Warning in cmake code at
- .*Tests/RunCMake/Syntax/StringNoSpace.cmake:2:28
+ .*/Tests/RunCMake/Syntax/StringNoSpace.cmake:2:28
Argument not separated from preceding token by whitespace.
Call Stack \(most recent call first\):
@@ -11,7 +11,7 @@ This warning is for project developers. Use -Wno-dev to suppress it.
CMake Warning \(dev\) in StringNoSpace.cmake:
Syntax Warning in cmake code at
- .*Tests/RunCMake/Syntax/StringNoSpace.cmake:2:31
+ .*/Tests/RunCMake/Syntax/StringNoSpace.cmake:2:31
Argument not separated from preceding token by whitespace.
Call Stack \(most recent call first\):
-----------------------------------------------------------------------
Summary of changes:
Tests/RunCMake/Syntax/BOM-UTF-16-BE-stderr.txt | 2 +-
Tests/RunCMake/Syntax/BOM-UTF-16-LE-stderr.txt | 2 +-
Tests/RunCMake/Syntax/BOM-UTF-32-BE-stderr.txt | 2 +-
Tests/RunCMake/Syntax/BOM-UTF-32-LE-stderr.txt | 2 +-
Tests/RunCMake/Syntax/BracketNoSpace0-stderr.txt | 2 +-
Tests/RunCMake/Syntax/BracketNoSpace1-stderr.txt | 2 +-
Tests/RunCMake/Syntax/BracketNoSpace2-stderr.txt | 2 +-
Tests/RunCMake/Syntax/BracketNoSpace3-stderr.txt | 2 +-
Tests/RunCMake/Syntax/BracketNoSpace4-stderr.txt | 2 +-
Tests/RunCMake/Syntax/BracketNoSpace5-stderr.txt | 2 +-
Tests/RunCMake/Syntax/ParenInENV-stderr.txt | 4 ++--
Tests/RunCMake/Syntax/ParenNoSpace1-stderr.txt | 6 +++---
Tests/RunCMake/Syntax/StringNoSpace-stderr.txt | 4 ++--
13 files changed, 17 insertions(+), 17 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list