[Cmake-commits] CMake branch, next, updated. v2.8.12.2-1691-gf5a69f6
Ben Boeckel
ben.boeckel at kitware.com
Mon Feb 24 11:54:46 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 f5a69f67471432455aeb609cd3b8e94687dea02c (commit)
via 198342a1eba104b50bd5ede9f0b08459a3cadcb4 (commit)
via 83e673dd45707eb080b3a291d35bca46341f4888 (commit)
via 2060ae9ff45f92db62354471d294779e71dd23d3 (commit)
from 742187d8b3ab0272da6283916ddd40e58531e526 (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=f5a69f67471432455aeb609cd3b8e94687dea02c
commit f5a69f67471432455aeb609cd3b8e94687dea02c
Merge: 742187d 198342a
Author: Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Mon Feb 24 11:54:45 2014 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 24 11:54:45 2014 -0500
Merge topic 'dev/faster-evis' into next
198342a1 Revert "tests: Fix StringFileTest for CMP0052"
83e673dd EVIS: Better comparison order for valid characters
2060ae9f EVIS: Enforce CMP0010 with the new parser
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=198342a1eba104b50bd5ede9f0b08459a3cadcb4
commit 198342a1eba104b50bd5ede9f0b08459a3cadcb4
Author: Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Mon Feb 24 11:51:24 2014 -0500
Commit: Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Mon Feb 24 11:51:24 2014 -0500
Revert "tests: Fix StringFileTest for CMP0052"
This reverts commit 162a583f90aea22a14e0356958e83156d2e07771.
diff --git a/Tests/StringFileTest/CMakeLists.txt b/Tests/StringFileTest/CMakeLists.txt
index 9b0312b..00383ab 100644
--- a/Tests/StringFileTest/CMakeLists.txt
+++ b/Tests/StringFileTest/CMakeLists.txt
@@ -143,9 +143,8 @@ endif()
# Obscure environment variable name
set("ENV{x+(y)}" "Obscure environment variable value")
-set(envvarname "x+(y)")
-message("Output: [$ENV{${envvarname}}]")
-if(NOT "$ENV{${envvarname}}" STREQUAL "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()
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=83e673dd45707eb080b3a291d35bca46341f4888
commit 83e673dd45707eb080b3a291d35bca46341f4888
Author: Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Mon Feb 24 11:50:24 2014 -0500
Commit: Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Mon Feb 24 11:50:24 2014 -0500
EVIS: Better comparison order for valid characters
'_' is much more common than '/' in practice, so move it up in the
short-circuitry.
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 3bb3d13..f3ffae6 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -2975,8 +2975,8 @@ cmake::MessageType cmMakefile::ExpandVariablesInStringNew(
default:
{
if(openstack.size() > 1 &&
- !(isalnum(inc) || inc == '/' ||
- inc == '_' || inc == '.' ||
+ !(isalnum(inc) || inc == '_' ||
+ inc == '/' || inc == '.' ||
inc == '+' || inc == '-' ||
inc == '(' || inc == ')'))
{
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2060ae9ff45f92db62354471d294779e71dd23d3
commit 2060ae9ff45f92db62354471d294779e71dd23d3
Author: Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Mon Feb 24 11:50:10 2014 -0500
Commit: Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Mon Feb 24 11:50:10 2014 -0500
EVIS: Enforce CMP0010 with the new parser
diff --git a/Help/policy/CMP0010.rst b/Help/policy/CMP0010.rst
index 01699e1..56674c1 100644
--- a/Help/policy/CMP0010.rst
+++ b/Help/policy/CMP0010.rst
@@ -10,6 +10,9 @@ variable reference is an error. The OLD behavior for this policy is
to warn about the error, leave the string untouched, and continue.
The NEW behavior for this policy is to report an error.
+If :policy:`CMP0052` is used, this policy has no effect and is treated as
+always being NEW.
+
This policy was introduced in CMake version 2.6.3. CMake version
|release| warns when the policy is not set and uses OLD behavior. Use
the cmake_policy command to set it to OLD or NEW explicitly.
diff --git a/Help/policy/CMP0052.rst b/Help/policy/CMP0052.rst
index c4cfab4..51713c4 100644
--- a/Help/policy/CMP0052.rst
+++ b/Help/policy/CMP0052.rst
@@ -15,6 +15,8 @@ literal variable names are restricted to alphanumerics and the characters
set(varname "disallowschars&")
message("${${varname}}")
+This policy also enforces :policy:`CMP0010` unconditionally.
+
The OLD behavior for this policy is to use the old variable expansion parser.
The NEW behavior is to use the new variable expansion rules.
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 6237da1..3bb3d13 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -2995,26 +2995,11 @@ cmake::MessageType cmMakefile::ExpandVariablesInStringNew(
// Check for open variable references yet.
if(!error && openstack.size() != 1)
{
- // There's an open variable reference waiting. Use policy CMP0010 to
- // decide whether it is an error.
- switch(this->GetPolicyStatus(cmPolicies::CMP0010))
- {
- case cmPolicies::WARN:
- errorstr += "\n" + this->GetPolicies()
- ->GetPolicyWarning(cmPolicies::CMP0010);
- case cmPolicies::OLD:
- // OLD behavior is to just warn and continue.
- mtype = cmake::AUTHOR_WARNING;
- break;
- case cmPolicies::REQUIRED_IF_USED:
- case cmPolicies::REQUIRED_ALWAYS:
- errorstr += "\n" + this->GetPolicies()
- ->GetRequiredPolicyError(cmPolicies::CMP0010);
- case cmPolicies::NEW:
- // NEW behavior is to report the error.
- mtype = cmake::FATAL_ERROR;
- break;
- }
+ // 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.";
+ mtype = cmake::FATAL_ERROR;
error = true;
}
-----------------------------------------------------------------------
Summary of changes:
Help/policy/CMP0010.rst | 3 +++
Help/policy/CMP0052.rst | 2 ++
Source/cmMakefile.cxx | 29 +++++++----------------------
Tests/StringFileTest/CMakeLists.txt | 5 ++---
4 files changed, 14 insertions(+), 25 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list