[Cmake-commits] CMake branch, next, updated. v2.8.12.2-1798-g1821040
Ben Boeckel
ben.boeckel at kitware.com
Wed Feb 26 21:33:56 EST 2014
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 18210400c7c76a2f4f0b7cefa8ead43938144109 (commit)
via 37ee6f021dbd50d60f4de999f7ec88e1ab3de6b9 (commit)
via 9180e0147a47a13708f66c7e308bd98238787eeb (commit)
via 2ec74b42b957c238017041c265a83578615a0b57 (commit)
via 92bd7ed3903479c05c815851652a30ec8adce3df (commit)
via 67f52bdc91a1b07e1dce610ea0a4d670bf466a45 (commit)
from 87aad47f293ccb7358e5e9e8cd854e9bd710d26f (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=18210400c7c76a2f4f0b7cefa8ead43938144109
commit 18210400c7c76a2f4f0b7cefa8ead43938144109
Merge: 87aad47 37ee6f0
Author: Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Wed Feb 26 21:33:54 2014 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 26 21:33:54 2014 -0500
Merge topic 'dev/faster-evis' into next
37ee6f02 tests: Add tests for parentheses in variable names
9180e014 tests: Add tests for unterminated braces
2ec74b42 CMP0052: Update docs with allowed characters
92bd7ed3 EVIS: Only allow literal parentheses in ENV expansions
67f52bdc EVIS: Remove excess newline in error message
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=37ee6f021dbd50d60f4de999f7ec88e1ab3de6b9
commit 37ee6f021dbd50d60f4de999f7ec88e1ab3de6b9
Author: Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Wed Feb 26 21:32:59 2014 -0500
Commit: Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Wed Feb 26 21:33:19 2014 -0500
tests: Add tests for parentheses in variable names
diff --git a/Tests/RunCMake/Syntax/ParenInVarName0-result.txt b/Tests/RunCMake/Syntax/ParenInVarName0-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/Syntax/ParenInVarName0-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/Syntax/ParenInVarName0-stderr.txt b/Tests/RunCMake/Syntax/ParenInVarName0-stderr.txt
new file mode 100644
index 0000000..2f117cd
--- /dev/null
+++ b/Tests/RunCMake/Syntax/ParenInVarName0-stderr.txt
@@ -0,0 +1,12 @@
+CMake Error at ParenInVarName0.cmake:4 \(message\):
+ Syntax error in cmake code at
+
+ .*/Tests/RunCMake/Syntax/ParenInVarName0.cmake:4
+
+ when parsing string
+
+ -->\${e\(x\)}<--
+
+ Invalid character \('\('\) in a variable name:
+Call Stack \(most recent call first\):
+ CMakeLists.txt:3 \(include\)
diff --git a/Tests/RunCMake/Syntax/ParenInVarName0.cmake b/Tests/RunCMake/Syntax/ParenInVarName0.cmake
new file mode 100644
index 0000000..a10c095
--- /dev/null
+++ b/Tests/RunCMake/Syntax/ParenInVarName0.cmake
@@ -0,0 +1,4 @@
+cmake_policy(SET CMP0052 NEW)
+
+set("e(x)" value)
+message("-->${e(x)}<--")
diff --git a/Tests/RunCMake/Syntax/ParenInVarName1-result.txt b/Tests/RunCMake/Syntax/ParenInVarName1-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/Syntax/ParenInVarName1-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/Syntax/ParenInVarName1-stderr.txt b/Tests/RunCMake/Syntax/ParenInVarName1-stderr.txt
new file mode 100644
index 0000000..81b1717
--- /dev/null
+++ b/Tests/RunCMake/Syntax/ParenInVarName1-stderr.txt
@@ -0,0 +1,12 @@
+CMake Error at ParenInVarName1.cmake:4 \(message\):
+ Syntax error in cmake code at
+
+ .*/Tests/RunCMake/Syntax/ParenInVarName1.cmake:4
+
+ when parsing string
+
+ -->\${e\(x\)}<--
+
+ syntax error, unexpected cal_SYMBOL, expecting } \(10\)
+Call Stack \(most recent call first\):
+ CMakeLists.txt:3 \(include\)
diff --git a/Tests/RunCMake/Syntax/ParenInVarName1.cmake b/Tests/RunCMake/Syntax/ParenInVarName1.cmake
new file mode 100644
index 0000000..4e7185d
--- /dev/null
+++ b/Tests/RunCMake/Syntax/ParenInVarName1.cmake
@@ -0,0 +1,4 @@
+cmake_policy(SET CMP0052 OLD)
+
+set("{e(x)}" value)
+message("-->${e(x)}<--")
diff --git a/Tests/RunCMake/Syntax/RunCMakeTest.cmake b/Tests/RunCMake/Syntax/RunCMakeTest.cmake
index e7c426a..d2986df 100644
--- a/Tests/RunCMake/Syntax/RunCMakeTest.cmake
+++ b/Tests/RunCMake/Syntax/RunCMakeTest.cmake
@@ -46,6 +46,8 @@ run_cmake(Escape1)
run_cmake(ParenNoSpace0)
run_cmake(ParenNoSpace1)
run_cmake(ParenNoSpace2)
+run_cmake(ParenInVarName0)
+run_cmake(ParenInVarName1)
run_cmake(UnterminatedCall1)
run_cmake(UnterminatedCall2)
run_cmake(UnterminatedString)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9180e0147a47a13708f66c7e308bd98238787eeb
commit 9180e0147a47a13708f66c7e308bd98238787eeb
Author: Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Wed Feb 26 21:19:35 2014 -0500
Commit: Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Wed Feb 26 21:33:19 2014 -0500
tests: Add tests for unterminated braces
diff --git a/Tests/RunCMake/Syntax/RunCMakeTest.cmake b/Tests/RunCMake/Syntax/RunCMakeTest.cmake
index 5f05cfc..e7c426a 100644
--- a/Tests/RunCMake/Syntax/RunCMakeTest.cmake
+++ b/Tests/RunCMake/Syntax/RunCMakeTest.cmake
@@ -49,6 +49,9 @@ run_cmake(ParenNoSpace2)
run_cmake(UnterminatedCall1)
run_cmake(UnterminatedCall2)
run_cmake(UnterminatedString)
+run_cmake(UnterminatedBrace0)
+run_cmake(UnterminatedBrace1)
+run_cmake(UnterminatedBrace2)
run_cmake(UnterminatedBracket0)
run_cmake(UnterminatedBracket1)
run_cmake(UnterminatedBracketComment)
diff --git a/Tests/RunCMake/Syntax/UnterminatedBrace0-result.txt b/Tests/RunCMake/Syntax/UnterminatedBrace0-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/Syntax/UnterminatedBrace0-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/Syntax/UnterminatedBrace0-stderr.txt b/Tests/RunCMake/Syntax/UnterminatedBrace0-stderr.txt
new file mode 100644
index 0000000..1e0ce49
--- /dev/null
+++ b/Tests/RunCMake/Syntax/UnterminatedBrace0-stderr.txt
@@ -0,0 +1,12 @@
+CMake Error at UnterminatedBrace0.cmake:2 \(set\):
+ Syntax error in cmake code at
+
+ .*/Tests/RunCMake/Syntax/UnterminatedBrace0.cmake:2
+
+ when parsing string
+
+ \${
+
+ syntax error, unexpected \$end, expecting } \(2\)
+Call Stack \(most recent call first\):
+ CMakeLists.txt:3 \(include\)
diff --git a/Tests/RunCMake/Syntax/UnterminatedBrace0.cmake b/Tests/RunCMake/Syntax/UnterminatedBrace0.cmake
new file mode 100644
index 0000000..0da1290
--- /dev/null
+++ b/Tests/RunCMake/Syntax/UnterminatedBrace0.cmake
@@ -0,0 +1,2 @@
+cmake_minimum_required(VERSION 3.0)
+set(var "${")
diff --git a/Tests/RunCMake/Syntax/UnterminatedBrace1-stderr.txt b/Tests/RunCMake/Syntax/UnterminatedBrace1-stderr.txt
new file mode 100644
index 0000000..4e3c2b5
--- /dev/null
+++ b/Tests/RunCMake/Syntax/UnterminatedBrace1-stderr.txt
@@ -0,0 +1,13 @@
+CMake Warning \(dev\) at UnterminatedBrace1.cmake:3 \(set\):
+ Syntax error in cmake code at
+
+ .*/Tests/RunCMake/Syntax/UnterminatedBrace1.cmake:3
+
+ when parsing string
+
+ \${
+
+ syntax error, unexpected \$end, expecting } \(2\)
+Call Stack \(most recent call first\):
+ CMakeLists.txt:3 \(include\)
+This warning is for project developers. Use -Wno-dev to suppress it.
diff --git a/Tests/RunCMake/Syntax/UnterminatedBrace1.cmake b/Tests/RunCMake/Syntax/UnterminatedBrace1.cmake
new file mode 100644
index 0000000..93fba34
--- /dev/null
+++ b/Tests/RunCMake/Syntax/UnterminatedBrace1.cmake
@@ -0,0 +1,3 @@
+cmake_minimum_required(VERSION 3.0)
+cmake_policy(SET CMP0010 OLD)
+set(var "${")
diff --git a/Tests/RunCMake/Syntax/UnterminatedBrace2-result.txt b/Tests/RunCMake/Syntax/UnterminatedBrace2-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/Syntax/UnterminatedBrace2-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/Syntax/UnterminatedBrace2-stderr.txt b/Tests/RunCMake/Syntax/UnterminatedBrace2-stderr.txt
new file mode 100644
index 0000000..582a25e
--- /dev/null
+++ b/Tests/RunCMake/Syntax/UnterminatedBrace2-stderr.txt
@@ -0,0 +1,12 @@
+CMake Error at UnterminatedBrace2.cmake:4 \(set\):
+ Syntax error in cmake code at
+
+ /home/boeckb/code/cmake/src/Tests/RunCMake/Syntax/UnterminatedBrace2.cmake:4
+
+ when parsing string
+
+ \${
+
+ There is an unterminated variable reference.
+Call Stack \(most recent call first\):
+ CMakeLists.txt:3 \(include\)
diff --git a/Tests/RunCMake/Syntax/UnterminatedBrace2.cmake b/Tests/RunCMake/Syntax/UnterminatedBrace2.cmake
new file mode 100644
index 0000000..2c88422
--- /dev/null
+++ b/Tests/RunCMake/Syntax/UnterminatedBrace2.cmake
@@ -0,0 +1,4 @@
+cmake_minimum_required(VERSION 3.0)
+cmake_policy(SET CMP0010 OLD)
+cmake_policy(SET CMP0052 NEW)
+set(var "${")
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2ec74b42b957c238017041c265a83578615a0b57
commit 2ec74b42b957c238017041c265a83578615a0b57
Author: Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Wed Feb 26 21:21:26 2014 -0500
Commit: Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Wed Feb 26 21:33:19 2014 -0500
CMP0052: Update docs with allowed characters
diff --git a/Help/policy/CMP0052.rst b/Help/policy/CMP0052.rst
index 51713c4..306b8dd 100644
--- a/Help/policy/CMP0052.rst
+++ b/Help/policy/CMP0052.rst
@@ -8,7 +8,8 @@ which offered some behavior no longer allowed by the new parser. Specifically,
'@' expansion is no longer performed in files not configured using
:command:`configure_file` or the CONFIGURE signature of :command:`string` and
literal variable names are restricted to alphanumerics and the characters
-"./-+()". If variables with other characters are required, use
+"./-+" and in environment variables "()" are also allowed. If variables with
+other characters are required, use
.. code-block:: cmake
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=92bd7ed3903479c05c815851652a30ec8adce3df
commit 92bd7ed3903479c05c815851652a30ec8adce3df
Author: Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Wed Feb 26 21:20:23 2014 -0500
Commit: Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Wed Feb 26 21:33:19 2014 -0500
EVIS: Only allow literal parentheses in ENV expansions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 7ca1710..f4d9e35 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -2996,7 +2996,8 @@ cmake::MessageType cmMakefile::ExpandVariablesInStringNew(
!(isalnum(inc) || inc == '_' ||
inc == '/' || inc == '.' ||
inc == '+' || inc == '-' ||
- inc == '(' || inc == ')'))
+ (openstack.top().domain == ENVIRONMENT && (
+ inc == '(' || inc == ')'))))
{
errorstr += "Invalid character (\'";
errorstr += inc;
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=67f52bdc91a1b07e1dce610ea0a4d670bf466a45
commit 67f52bdc91a1b07e1dce610ea0a4d670bf466a45
Author: Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Wed Feb 26 21:19:06 2014 -0500
Commit: Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Wed Feb 26 21:19:06 2014 -0500
EVIS: Remove excess newline in error message
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 9263df8..7ca1710 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -3016,7 +3016,7 @@ cmake::MessageType cmMakefile::ExpandVariablesInStringNew(
// There's an open variable reference waiting. Policy CMP0010 flags
// whether this is an error or not. The new parser now enforces
// CMP0010 as well.
- errorstr += "\nThere is an unterminated variable reference.";
+ errorstr += "There is an unterminated variable reference.";
mtype = cmake::FATAL_ERROR;
error = true;
}
-----------------------------------------------------------------------
Summary of changes:
Help/policy/CMP0052.rst | 3 ++-
Source/cmMakefile.cxx | 5 +++--
.../ParenInVarName0-result.txt} | 0
Tests/RunCMake/Syntax/ParenInVarName0-stderr.txt | 12 ++++++++++++
Tests/RunCMake/Syntax/ParenInVarName0.cmake | 4 ++++
.../ParenInVarName1-result.txt} | 0
Tests/RunCMake/Syntax/ParenInVarName1-stderr.txt | 12 ++++++++++++
Tests/RunCMake/Syntax/ParenInVarName1.cmake | 4 ++++
Tests/RunCMake/Syntax/RunCMakeTest.cmake | 5 +++++
.../UnterminatedBrace0-result.txt} | 0
Tests/RunCMake/Syntax/UnterminatedBrace0-stderr.txt | 12 ++++++++++++
Tests/RunCMake/Syntax/UnterminatedBrace0.cmake | 2 ++
Tests/RunCMake/Syntax/UnterminatedBrace1-stderr.txt | 13 +++++++++++++
Tests/RunCMake/Syntax/UnterminatedBrace1.cmake | 3 +++
.../UnterminatedBrace2-result.txt} | 0
Tests/RunCMake/Syntax/UnterminatedBrace2-stderr.txt | 12 ++++++++++++
Tests/RunCMake/Syntax/UnterminatedBrace2.cmake | 4 ++++
17 files changed, 88 insertions(+), 3 deletions(-)
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => Syntax/ParenInVarName0-result.txt} (100%)
create mode 100644 Tests/RunCMake/Syntax/ParenInVarName0-stderr.txt
create mode 100644 Tests/RunCMake/Syntax/ParenInVarName0.cmake
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => Syntax/ParenInVarName1-result.txt} (100%)
create mode 100644 Tests/RunCMake/Syntax/ParenInVarName1-stderr.txt
create mode 100644 Tests/RunCMake/Syntax/ParenInVarName1.cmake
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => Syntax/UnterminatedBrace0-result.txt} (100%)
create mode 100644 Tests/RunCMake/Syntax/UnterminatedBrace0-stderr.txt
create mode 100644 Tests/RunCMake/Syntax/UnterminatedBrace0.cmake
create mode 100644 Tests/RunCMake/Syntax/UnterminatedBrace1-stderr.txt
create mode 100644 Tests/RunCMake/Syntax/UnterminatedBrace1.cmake
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => Syntax/UnterminatedBrace2-result.txt} (100%)
create mode 100644 Tests/RunCMake/Syntax/UnterminatedBrace2-stderr.txt
create mode 100644 Tests/RunCMake/Syntax/UnterminatedBrace2.cmake
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list