[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-2724-g284d350
Ben Boeckel
ben.boeckel at kitware.com
Fri May 2 12:52:02 EDT 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 284d350f6450bdd39374a96717643fedcae4804d (commit)
via 9e9104dc4a9ae841cf19230c3221a18939ed9bc7 (commit)
via 19b3eb38acdab925cdd3a2b55a62579a8f45764e (commit)
via cc4bf45a2c63dacf1e2396d6f96ecbf5f4ac64cb (commit)
via 942a8c4552f2ad05be9228744a7c37bb1e25b089 (commit)
from 62b4dfbc433d7a1e4747ae749091dcf1ec298219 (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=284d350f6450bdd39374a96717643fedcae4804d
commit 284d350f6450bdd39374a96717643fedcae4804d
Merge: 62b4dfb 9e9104d
Author: Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Fri May 2 12:52:00 2014 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri May 2 12:52:00 2014 -0400
Merge topic 'dev/faster-evis' into next
9e9104dc tests: Test NUL and parentheses in CMP0053
19b3eb38 tests: Test other escape patterns
cc4bf45a EVIS: Disallow literal () in ENV variables
942a8c45 EVIS: Initialize t_lookup members
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9e9104dc4a9ae841cf19230c3221a18939ed9bc7
commit 9e9104dc4a9ae841cf19230c3221a18939ed9bc7
Author: Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Fri May 2 12:57:11 2014 -0400
Commit: Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Fri May 2 12:57:11 2014 -0400
tests: Test NUL and parentheses in CMP0053
Also remove them from StringFileTest since they belong in Syntax.
diff --git a/Tests/RunCMake/Syntax/CMP0053-NUL-stderr.txt b/Tests/RunCMake/Syntax/CMP0053-NUL-stderr.txt
new file mode 100644
index 0000000..5ab2846c
--- /dev/null
+++ b/Tests/RunCMake/Syntax/CMP0053-NUL-stderr.txt
@@ -0,0 +1,40 @@
+^CMake Warning \(dev\) at CMP0053-NUL.cmake:1 \(set\):
+ Policy CMP0053 is not set: Simplify variable reference and escape sequence
+ evaluation. Run "cmake --help-policy CMP0053" for policy details. Use the
+ cmake_policy command to set the policy and suppress this warning.
+
+ Input: '\\0'
+ Old behavior is accepted and the new behavior causes an error: 'Syntax error in cmake code at
+ .*/Tests/RunCMake/Syntax/CMP0053-NUL.cmake:1
+
+ when parsing string
+
+ \\0
+
+ Invalid character escape '\\0'.'
+Call Stack \(most recent call first\):
+ CMakeLists.txt:3 \(include\)
+This warning is for project developers. Use -Wno-dev to suppress it.
+
+CMake Warning \(dev\) at CMP0053-NUL.cmake:2 \(set\):
+ Policy CMP0053 is not set: Simplify variable reference and escape sequence
+ evaluation. Run "cmake --help-policy CMP0053" for policy details. Use the
+ cmake_policy command to set the policy and suppress this warning.
+
+ Input: '\\0'
+ Old behavior is accepted and the new behavior causes an error: 'Syntax error in cmake code at
+ .*/Tests/RunCMake/Syntax/CMP0053-NUL.cmake:2
+
+ when parsing string
+
+ \\0
+
+ Invalid character escape '\\0'.'
+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/CMP0053-NUL.cmake b/Tests/RunCMake/Syntax/CMP0053-NUL.cmake
new file mode 100644
index 0000000..9ae0906
--- /dev/null
+++ b/Tests/RunCMake/Syntax/CMP0053-NUL.cmake
@@ -0,0 +1,6 @@
+set(qnul "\0")
+set(nul \0)
+message(-->${nul}<--)
+message(-->${qnul}<--)
+message("-->${nul}<--")
+message("-->${qnul}<--")
diff --git a/Tests/RunCMake/Syntax/CMP0053-ParenInENV-stderr.txt b/Tests/RunCMake/Syntax/CMP0053-ParenInENV-stderr.txt
new file mode 100644
index 0000000..7020c7e
--- /dev/null
+++ b/Tests/RunCMake/Syntax/CMP0053-ParenInENV-stderr.txt
@@ -0,0 +1 @@
+-->value<--
diff --git a/Tests/RunCMake/Syntax/CMP0053-ParenInENV.cmake b/Tests/RunCMake/Syntax/CMP0053-ParenInENV.cmake
new file mode 100644
index 0000000..b5cdf0f
--- /dev/null
+++ b/Tests/RunCMake/Syntax/CMP0053-ParenInENV.cmake
@@ -0,0 +1,3 @@
+cmake_policy(SET CMP0053 NEW)
+set("ENV{e(x)}" value)
+message(-->$ENV{e\(x\)}<--)
diff --git a/Tests/RunCMake/Syntax/CMP0053-ParenInQuotedENV-stderr.txt b/Tests/RunCMake/Syntax/CMP0053-ParenInQuotedENV-stderr.txt
new file mode 100644
index 0000000..7020c7e
--- /dev/null
+++ b/Tests/RunCMake/Syntax/CMP0053-ParenInQuotedENV-stderr.txt
@@ -0,0 +1 @@
+-->value<--
diff --git a/Tests/RunCMake/Syntax/CMP0053-ParenInQuotedENV.cmake b/Tests/RunCMake/Syntax/CMP0053-ParenInQuotedENV.cmake
new file mode 100644
index 0000000..5559d4b
--- /dev/null
+++ b/Tests/RunCMake/Syntax/CMP0053-ParenInQuotedENV.cmake
@@ -0,0 +1,3 @@
+cmake_policy(SET CMP0053 NEW)
+set("ENV{e(x)}" value)
+message("-->$ENV{e\(x\)}<--")
diff --git a/Tests/RunCMake/Syntax/RunCMakeTest.cmake b/Tests/RunCMake/Syntax/RunCMakeTest.cmake
index c53549f..7c94e1a 100644
--- a/Tests/RunCMake/Syntax/RunCMakeTest.cmake
+++ b/Tests/RunCMake/Syntax/RunCMakeTest.cmake
@@ -9,6 +9,9 @@ run_cmake(CMP0053-At-OLD)
run_cmake(CMP0053-At-NEW)
run_cmake(CMP0053-At-WARN)
run_cmake(CMP0053-WARN)
+run_cmake(CMP0053-NUL)
+run_cmake(CMP0053-ParenInENV)
+run_cmake(CMP0053-ParenInQuotedENV)
run_cmake(CommandSpaces)
run_cmake(CommandTabs)
run_cmake(CommandNewlines)
diff --git a/Tests/StringFileTest/CMakeLists.txt b/Tests/StringFileTest/CMakeLists.txt
index be6d8fe..4fa5a86 100644
--- a/Tests/StringFileTest/CMakeLists.txt
+++ b/Tests/StringFileTest/CMakeLists.txt
@@ -127,12 +127,6 @@ string(LENGTH ${substringres} lengthres)
file(RELATIVE_PATH relpath "/usr/local/bin" "/usr/X11R6/bin/xnest")
-# Escaping test
-set(var "\\ \" \ \t \n \r \# \( \) \0")
-message("Output: [${var}]")
-set(var \\ \" \ \t \n \r \# \( \) \0)
-message("Output: [${var}]")
-
# Make-style unquoted argument test
set(var $(VAR1)$(VAR2)/$(VAR3))
message("Output: [${var}]")
@@ -141,13 +135,6 @@ if(NOT result)
message(SEND_ERROR "Unquoted $(VAR) syntax is broken.")
endif()
-# Obscure environment variable name
-set("ENV{x+(y)}" "Obscure environment variable value")
-message("Output: [$ENV{x+(y)}]")
-if(NOT "$ENV{x+(y)}" STREQUAL "Obscure environment variable value")
- message(SEND_ERROR "Environment variable \"ENV{x+(y)}\" does not work.")
-endif()
-
# Make directories test
file(MAKE_DIRECTORY
"${CMAKE_CURRENT_BINARY_DIR}/Includes"
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=19b3eb38acdab925cdd3a2b55a62579a8f45764e
commit 19b3eb38acdab925cdd3a2b55a62579a8f45764e
Author: Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Fri May 2 12:56:48 2014 -0400
Commit: Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Fri May 2 12:56:48 2014 -0400
tests: Test other escape patterns
diff --git a/Tests/RunCMake/Syntax/EscapeCharsAllowed-stderr.txt b/Tests/RunCMake/Syntax/EscapeCharsAllowed-stderr.txt
index d0c3832..e658de7 100644
--- a/Tests/RunCMake/Syntax/EscapeCharsAllowed-stderr.txt
+++ b/Tests/RunCMake/Syntax/EscapeCharsAllowed-stderr.txt
@@ -4,5 +4,9 @@
-->bracket<--
-->newline<--
-->octothorpe<--
+-->splat<--
+-->caret<--
+-->paren<--
+-->dquote<--
-->top-levelsemicolon<--
-->top-level;escaped;semicolon<--$
diff --git a/Tests/RunCMake/Syntax/EscapeCharsAllowed.cmake b/Tests/RunCMake/Syntax/EscapeCharsAllowed.cmake
index 771436a..e9c568d 100644
--- a/Tests/RunCMake/Syntax/EscapeCharsAllowed.cmake
+++ b/Tests/RunCMake/Syntax/EscapeCharsAllowed.cmake
@@ -6,6 +6,10 @@ set("brace{in}name" brace)
set("bracket[in]name" bracket)
set("newline\nin\nname" newline)
set("octothorpe\#in\#name" octothorpe)
+set("splat\@in\@name" splat)
+set("caret\^in\^name" caret)
+set("paren\(in\)name" paren)
+set("dquote\"in\"name" dquote)
message("-->${semicolon\;in\;name}<--")
message("-->${dollar\$in\$name}<--")
@@ -13,6 +17,10 @@ message("-->${brace\{in\}name}<--")
message("-->${bracket\[in\]name}<--")
message("-->${newline\nin\nname}<--")
message("-->${octothorpe\#in\#name}<--")
+message("-->${splat\@in\@name}<--")
+message("-->${caret\^in\^name}<--")
+message("-->${paren\(in\)name}<--")
+message("-->${dquote\"in\"name}<--")
message(-->top-level;semicolon<--)
message(-->top-level\;escaped\;semicolon<--)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cc4bf45a2c63dacf1e2396d6f96ecbf5f4ac64cb
commit cc4bf45a2c63dacf1e2396d6f96ecbf5f4ac64cb
Author: Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Fri May 2 12:56:31 2014 -0400
Commit: Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Fri May 2 12:56:31 2014 -0400
EVIS: Disallow literal () in ENV variables
diff --git a/Help/policy/CMP0053.rst b/Help/policy/CMP0053.rst
index b6c6da0..fac430e 100644
--- a/Help/policy/CMP0053.rst
+++ b/Help/policy/CMP0053.rst
@@ -16,9 +16,8 @@ cleaned up to simplify the behavior. Specifically:
* Literal ``${VAR}`` reference syntax may contain only
alphanumeric characters (``A-Z``, ``a-z``, ``0-9``) and
the characters ``_``, ``.``, ``/``, ``-``, and ``+``.
- Literal ``$ENV{VAR}`` reference syntax may also use
- ``(`` and ``)``. Variables with other characters in
- their name may still be referenced indirectly, e.g.
+ Variables with other characters in their name may still
+ be referenced indirectly, e.g.
.. code-block:: cmake
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 1d9558f..b6455b1 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -3071,9 +3071,7 @@ cmake::MessageType cmMakefile::ExpandVariablesInStringNew(
if(openstack.size() > 1 &&
!(isalnum(inc) || inc == '_' ||
inc == '/' || inc == '.' ||
- inc == '+' || inc == '-' ||
- (openstack.top().domain == ENVIRONMENT && (
- inc == '(' || inc == ')'))))
+ inc == '+' || inc == '-'))
{
errorstr += "Invalid character (\'";
errorstr += inc;
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=942a8c4552f2ad05be9228744a7c37bb1e25b089
commit 942a8c4552f2ad05be9228744a7c37bb1e25b089
Author: Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Fri May 2 12:34:59 2014 -0400
Commit: Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Fri May 2 12:34:59 2014 -0400
EVIS: Initialize t_lookup members
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 3339c16..1d9558f 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -2812,6 +2812,7 @@ typedef enum
} t_domain;
struct t_lookup
{
+ t_lookup(): domain(NORMAL), loc(0) {}
t_domain domain;
size_t loc;
};
-----------------------------------------------------------------------
Summary of changes:
Help/policy/CMP0053.rst | 5 +--
Source/cmMakefile.cxx | 5 +--
Tests/RunCMake/Syntax/CMP0053-NUL-stderr.txt | 40 ++++++++++++++++++++
Tests/RunCMake/Syntax/CMP0053-NUL.cmake | 6 +++
...NV-stderr.txt => CMP0053-ParenInENV-stderr.txt} | 0
Tests/RunCMake/Syntax/CMP0053-ParenInENV.cmake | 3 ++
...err.txt => CMP0053-ParenInQuotedENV-stderr.txt} | 0
.../RunCMake/Syntax/CMP0053-ParenInQuotedENV.cmake | 3 ++
.../RunCMake/Syntax/EscapeCharsAllowed-stderr.txt | 4 ++
Tests/RunCMake/Syntax/EscapeCharsAllowed.cmake | 8 ++++
Tests/RunCMake/Syntax/RunCMakeTest.cmake | 3 ++
Tests/StringFileTest/CMakeLists.txt | 13 -------
12 files changed, 71 insertions(+), 19 deletions(-)
create mode 100644 Tests/RunCMake/Syntax/CMP0053-NUL-stderr.txt
create mode 100644 Tests/RunCMake/Syntax/CMP0053-NUL.cmake
copy Tests/RunCMake/Syntax/{ParenInQuotedENV-stderr.txt => CMP0053-ParenInENV-stderr.txt} (100%)
create mode 100644 Tests/RunCMake/Syntax/CMP0053-ParenInENV.cmake
copy Tests/RunCMake/Syntax/{ParenInQuotedENV-stderr.txt => CMP0053-ParenInQuotedENV-stderr.txt} (100%)
create mode 100644 Tests/RunCMake/Syntax/CMP0053-ParenInQuotedENV.cmake
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list