[Cmake-commits] CMake branch, next, updated. v3.0.0-rc1-469-g65a6a31
Brad King
brad.king at kitware.com
Tue Mar 4 09:47:15 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 65a6a31a0f1981557bc7c224457763d012be6197 (commit)
via 4d02ac9ae83176c01a495f8bcb45a15af5acf4d5 (commit)
from 955104e6637fad91e8f82d92b34a122aef263319 (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=65a6a31a0f1981557bc7c224457763d012be6197
commit 65a6a31a0f1981557bc7c224457763d012be6197
Merge: 955104e 4d02ac9
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 4 09:47:13 2014 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Mar 4 09:47:13 2014 -0500
Merge topic 'dev/faster-evis' into next
4d02ac9a Revert topic 'dev/faster-evis'
diff --cc Tests/RunCMake/CMakeLists.txt
index 8111717,9bb097b..cb44102
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@@ -34,9 -34,8 +34,8 @@@ add_RunCMake_test(CMP0045
add_RunCMake_test(CMP0046)
add_RunCMake_test(CMP0049)
add_RunCMake_test(CMP0050)
- add_RunCMake_test(CMP0052)
add_RunCMake_test(CTest)
-if(UNIX AND "${CMAKE_TEST_GENERATOR}" MATCHES "Unix Makefiles")
+if(UNIX AND "${CMAKE_GENERATOR}" MATCHES "Unix Makefiles")
add_RunCMake_test(CompilerChange)
endif()
add_RunCMake_test(CompilerNotFound)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4d02ac9ae83176c01a495f8bcb45a15af5acf4d5
commit 4d02ac9ae83176c01a495f8bcb45a15af5acf4d5
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 4 09:47:28 2014 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Mar 4 09:47:28 2014 -0500
Revert topic 'dev/faster-evis'
It will be revised and restored again.
diff --git a/Help/manual/cmake-policies.7.rst b/Help/manual/cmake-policies.7.rst
index 0043bd2..8650a58 100644
--- a/Help/manual/cmake-policies.7.rst
+++ b/Help/manual/cmake-policies.7.rst
@@ -102,4 +102,3 @@ All Policies
/policy/CMP0048
/policy/CMP0049
/policy/CMP0050
- /policy/CMP0052
diff --git a/Help/policy/CMP0010.rst b/Help/policy/CMP0010.rst
index 56674c1..01699e1 100644
--- a/Help/policy/CMP0010.rst
+++ b/Help/policy/CMP0010.rst
@@ -10,9 +10,6 @@ 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
deleted file mode 100644
index 306b8dd..0000000
--- a/Help/policy/CMP0052.rst
+++ /dev/null
@@ -1,26 +0,0 @@
-CMP0052
--------
-
-Use new variable expansion rules.
-
-CMake 3.0 and lower used an older, slower implementation of variable expansion
-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
-"./-+" and in environment variables "()" are also allowed. If variables with
-other characters are required, use
-
-.. code-block:: cmake
-
- 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.
-
-This policy was introduced in CMake version 3.1. 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/release/dev/faster-evis.rst b/Help/release/dev/faster-evis.rst
deleted file mode 100644
index 14b60a0..0000000
--- a/Help/release/dev/faster-evis.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-faster-evis
------------
-
-* The :manual:`cmake-language(7)` internal implementation of variable
- evaluation has been optimized and shows non-trivial speedup on large
- projects. The improvements may be used by setting :policy:`CMP0052` to NEW.
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index f4d9e35..f248c57 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -157,7 +157,6 @@ void cmMakefile::Initialize()
this->cmDefineRegex.compile("#cmakedefine[ \t]+([A-Za-z_0-9]*)");
this->cmDefine01Regex.compile("#cmakedefine01[ \t]+([A-Za-z_0-9]*)");
this->cmAtVarRegex.compile("(@[A-Za-z_0-9/.+-]+@)");
- this->cmNamedCurly.compile("^[A-Za-z0-9/_.+-]+{");
// Enter a policy level for this directory.
this->PushPolicy();
@@ -2534,106 +2533,23 @@ const char *cmMakefile::ExpandVariablesInString(std::string& source,
bool removeEmpty,
bool replaceAt) const
{
- if ( source.find_first_of("$@\\") == source.npos)
+ if ( source.empty() || source.find_first_of("$@\\") == source.npos)
{
return source.c_str();
}
- bool compareResults = false;
- cmake::MessageType mtype = cmake::LOG;
- std::string errorstr;
- std::string original;
-
- // Sanity check the @ONLY mode.
- if(atOnly && (!noEscapes || !removeEmpty))
- {
- // This case should never be called. At-only is for
- // configure-file/string which always does no escapes.
- this->IssueMessage(cmake::INTERNAL_ERROR,
- "ExpandVariablesInString @ONLY called "
- "on something with escapes.");
- return source.c_str();
- }
-
- // Variables used in the WARN case.
- std::string newResult;
- std::string newErrorstr;
- cmake::MessageType newError = cmake::LOG;
-
- switch(this->GetPolicyStatus(cmPolicies::CMP0052))
- {
- case cmPolicies::WARN:
- {
- // Save the original string for the warning.
- original = source;
- newResult = source;
- compareResults = true;
- newError =
- ExpandVariablesInStringNew(newErrorstr, newResult, escapeQuotes,
- noEscapes, atOnly, filename, line,
- removeEmpty, replaceAt);
- }
- case cmPolicies::OLD:
- mtype = ExpandVariablesInStringOld(errorstr, source, escapeQuotes,
- noEscapes, atOnly, filename,
- line, removeEmpty, true);
- break;
- case cmPolicies::REQUIRED_IF_USED:
- case cmPolicies::REQUIRED_ALWAYS:
- // Messaging here would be *very* verbose.
- case cmPolicies::NEW:
- mtype = ExpandVariablesInStringNew(errorstr, source, escapeQuotes,
- noEscapes, atOnly, filename,
- line, removeEmpty, replaceAt);
- break;
- }
-
- // If it's an error in either case, just report the error...
- if(mtype != cmake::LOG)
- {
- if(mtype == cmake::FATAL_ERROR)
- {
- cmSystemTools::SetFatalErrorOccured();
- }
- this->IssueMessage(mtype, errorstr);
- }
- // ...otherwise, see if there's a difference that needs to be warned about.
- else if(compareResults && (newResult != source || newError != mtype))
+ // Special-case the @ONLY mode.
+ if(atOnly)
{
- std::string message =
- this->GetPolicies()->GetPolicyWarning(cmPolicies::CMP0052);
- message += "\n Input: \'" + original + "\'";
- if(newError != mtype)
- {
- message += "\n Old behavior is accepted and "
- "the new behavior causes an error: "
- "\'" + newErrorstr + "\'";
- }
- else
+ if(!noEscapes || !removeEmpty || !replaceAt)
{
- message += "\n Old expansion: \'" + source + "\'";
- message += "\n New expansion: \'" + newResult + "\'";
+ // This case should never be called. At-only is for
+ // configure-file/string which always does no escapes.
+ this->IssueMessage(cmake::INTERNAL_ERROR,
+ "ExpandVariablesInString @ONLY called "
+ "on something with escapes.");
}
- this->IssueMessage(cmake::AUTHOR_WARNING, message);
- }
- return source.c_str();
-}
-
-cmake::MessageType cmMakefile::ExpandVariablesInStringOld(
- std::string& errorstr,
- std::string& source,
- bool escapeQuotes,
- bool noEscapes,
- bool atOnly,
- const char* filename,
- long line,
- bool removeEmpty,
- bool replaceAt) const
-{
- // Special-case the @ONLY mode.
- if(atOnly)
- {
// Store an original copy of the input.
std::string input = source;
@@ -2673,7 +2589,7 @@ cmake::MessageType cmMakefile::ExpandVariablesInStringOld(
// Append the rest of the unchanged part of the string.
source.append(in);
- return cmake::LOG;
+ return source.c_str();
}
// This method replaces ${VAR} and @VAR@ where VAR is looked up
@@ -2690,7 +2606,6 @@ cmake::MessageType cmMakefile::ExpandVariablesInStringOld(
parser.SetRemoveEmpty(removeEmpty);
int res = parser.ParseString(source.c_str(), 0);
const char* emsg = parser.GetError();
- cmake::MessageType mtype = cmake::LOG;
if ( res && !emsg[0] )
{
source = parser.GetResult();
@@ -2717,7 +2632,7 @@ cmake::MessageType cmMakefile::ExpandVariablesInStringOld(
// parser reported an error message without failing because the
// helper implementation is unhappy, which has always reported an
// error.
- mtype = cmake::FATAL_ERROR;
+ cmake::MessageType mtype = cmake::FATAL_ERROR;
if(!res)
{
// This is a real argument parsing error. Use policy CMP0010 to
@@ -2739,315 +2654,13 @@ cmake::MessageType cmMakefile::ExpandVariablesInStringOld(
->GetRequiredPolicyError(cmPolicies::CMP0010));
case cmPolicies::NEW:
// NEW behavior is to report the error.
+ cmSystemTools::SetFatalErrorOccured();
break;
}
}
- errorstr = error.str();
- }
- return mtype;
-}
-
-typedef enum
- {
- NORMAL,
- ENVIRONMENT,
- CACHE
- } t_domain;
-struct t_lookup
- {
- t_domain domain;
- std::string lookup;
- };
-
-cmake::MessageType cmMakefile::ExpandVariablesInStringNew(
- std::string& errorstr,
- std::string& source,
- bool escapeQuotes,
- bool noEscapes,
- bool atOnly,
- const char* filename,
- long line,
- bool removeEmpty,
- bool replaceAt) const
-{
- // This method replaces ${VAR} and @VAR@ where VAR is looked up
- // with GetDefinition(), if not found in the map, nothing is expanded.
- // It also supports the $ENV{VAR} syntax where VAR is looked up in
- // the current environment variables.
-
- const char* in = source.c_str();
- const char* last = in;
- std::stack<t_lookup> openstack;
- bool error = false;
- bool done = false;
- openstack.push(t_lookup());
- cmake::MessageType mtype = cmake::LOG;
-
- do
- {
- char inc = *in;
- switch(inc)
- {
- case '}':
- if(openstack.size() > 1)
- {
- t_lookup var = openstack.top();
- openstack.pop();
- std::string lookup = var.lookup;
- lookup.append(last, in - last);
- const char* value = NULL;
- switch(var.domain)
- {
- case NORMAL:
- if(filename && lookup == "CMAKE_CURRENT_LIST_LINE")
- {
- cmOStringStream ostr;
- ostr << line;
- openstack.top().lookup.append(ostr.str());
- }
- else
- {
- value = this->GetDefinition(lookup.c_str());
- }
- break;
- case ENVIRONMENT:
- value = cmSystemTools::GetEnv(lookup.c_str());
- break;
- case CACHE:
- value = this->GetCacheManager()->GetCacheValue(lookup.c_str());
- break;
- }
- // Get the string we're meant to append to.
- std::string result;
- if(value)
- {
- if(escapeQuotes)
- {
- result = cmSystemTools::EscapeQuotes(value);
- }
- else
- {
- result = value;
- }
- }
- else if(!removeEmpty)
- {
- // check to see if we need to print a warning
- // if strict mode is on and the variable has
- // not been "cleared"/initialized with a set(foo ) call
- if(this->GetCMakeInstance()->GetWarnUninitialized() &&
- !this->VariableInitialized(lookup.c_str()))
- {
- if (this->CheckSystemVars ||
- cmSystemTools::IsSubDirectory(filename,
- this->GetHomeDirectory()) ||
- cmSystemTools::IsSubDirectory(filename,
- this->GetHomeOutputDirectory()))
- {
- cmOStringStream msg;
- cmListFileBacktrace bt;
- cmListFileContext lfc;
- lfc.FilePath = filename;
- lfc.Line = line;
- bt.push_back(lfc);
- msg << "uninitialized variable \'" << lookup << "\'";
- this->GetCMakeInstance()->IssueMessage(cmake::AUTHOR_WARNING,
- msg.str().c_str(), bt);
- }
- }
- }
- openstack.top().lookup.append(result);
- // Start looking from here on out.
- last = in + 1;
- }
- break;
- case '$':
- if(!atOnly)
- {
- t_lookup lookup;
- const char* next = in + 1;
- const char* start = NULL;
- char nextc = *next;
- if(nextc == '{')
- {
- // Looking for a variable.
- start = in + 2;
- lookup.domain = NORMAL;
- }
- else if(nextc == '<')
- {
- }
- else if(!nextc)
- {
- openstack.top().lookup.append(last, next - last);
- last = next;
- }
- else if(cmHasLiteralPrefix(next, "ENV{"))
- {
- // Looking for an environment variable.
- start = in + 5;
- lookup.domain = ENVIRONMENT;
- }
- else if(cmHasLiteralPrefix(next, "CACHE{"))
- {
- // Looking for a cache variable.
- start = in + 7;
- lookup.domain = CACHE;
- }
- else
- {
- if(this->cmNamedCurly.find(next))
- {
- errorstr = "Syntax $"
- + std::string(next, this->cmNamedCurly.end())
- + "{} is not supported. Only ${}, $ENV{}, "
- "and $CACHE{} are allowed.";
- mtype = cmake::FATAL_ERROR;
- error = true;
- }
- }
- if(start)
- {
- openstack.top().lookup.append(last, in - last);
- last = start;
- in = start - 1;
- openstack.push(lookup);
- }
- break;
- }
- case '\\':
- if(!noEscapes)
- {
- const char* next = in + 1;
- char nextc = *next;
- if(nextc == 't')
- {
- openstack.top().lookup.append(last, in - last);
- openstack.top().lookup.append("\t");
- last = next + 1;
- }
- else if(nextc == 'n')
- {
- openstack.top().lookup.append(last, in - last);
- openstack.top().lookup.append("\n");
- last = next + 1;
- }
- else if(nextc == 'r')
- {
- openstack.top().lookup.append(last, in - last);
- openstack.top().lookup.append("\r");
- last = next + 1;
- }
- else if(nextc == ';')
- {
- // Handled in ExpandListArgument.
- }
- else
- {
- // Take what we've found so far, skipping the escape character.
- openstack.top().lookup.append(last, in - last);
- // Start tracking from the next character.
- last = in + 1;
- }
- // Skip the next character since it was escaped, but don't read past
- // the end of the string.
- if(*last)
- {
- ++in;
- }
- }
- break;
- case '\n':
- // Onto the next line.
- ++line;
- break;
- case '\0':
- done = true;
- break;
- case '@':
- if(replaceAt)
- {
- const char* nextAt = strchr(in + 1, '@');
- if(nextAt && nextAt != in + 1 &&
- nextAt == in + 1 + strspn(in + 1,
- "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
- "abcdefghijklmnopqrstuvwxyz"
- "0123456789/_.+-"))
- {
- std::string variable(in + 1, nextAt - in - 1);
- std::string result = this->GetSafeDefinition(variable.c_str());
- if(escapeQuotes)
- {
- result = cmSystemTools::EscapeQuotes(result.c_str());
- }
- // Skip over the variable.
- openstack.top().lookup.append(last, in - last);
- openstack.top().lookup.append(result);
- in = nextAt;
- last = in + 1;
- break;
- }
- }
- // Failed to find a valid @ expansion; treat it as literal.
- /* FALLTHROUGH */
- default:
- {
- if(openstack.size() > 1 &&
- !(isalnum(inc) || inc == '_' ||
- inc == '/' || inc == '.' ||
- inc == '+' || inc == '-' ||
- (openstack.top().domain == ENVIRONMENT && (
- inc == '(' || inc == ')'))))
- {
- errorstr += "Invalid character (\'";
- errorstr += inc;
- errorstr += "\') in a variable name: " + openstack.top().lookup;
- mtype = cmake::FATAL_ERROR;
- error = true;
- }
- break;
- }
- }
- // Look at the next character.
- } while(!error && !done && *++in);
-
- // Check for open variable references yet.
- if(!error && openstack.size() != 1)
- {
- // 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 += "There is an unterminated variable reference.";
- mtype = cmake::FATAL_ERROR;
- error = true;
- }
-
- if(error)
- {
- cmOStringStream emsg;
- emsg << "Syntax error in cmake code ";
- if(filename)
- {
- // This filename and line number may be more specific than the
- // command context because one command invocation can have
- // arguments on multiple lines.
- emsg << "at\n"
- << " " << filename << ":" << line << "\n";
- }
- emsg << "when parsing string\n"
- << " " << source << "\n";
- emsg << errorstr;
- errorstr = emsg.str();
- }
- else
- {
- // Append the rest of the unchanged part of the string.
- openstack.top().lookup.append(last);
-
- source = openstack.top().lookup;
+ this->IssueMessage(mtype, error.str());
}
-
- return mtype;
+ return source.c_str();
}
void cmMakefile::RemoveVariablesInString(std::string& source,
@@ -3270,7 +2883,7 @@ bool cmMakefile::ExpandArguments(
value = i->Value;
this->ExpandVariablesInString(value, false, false, false,
i->FilePath, i->Line,
- false, false);
+ false, true);
// If the argument is quoted, it should be one argument.
// Otherwise, it may be a list of arguments.
@@ -3829,7 +3442,7 @@ void cmMakefile::ConfigureString(const std::string& input,
// Perform variable replacements.
this->ExpandVariablesInString(output, escapeQuotes, true,
- atOnly, 0, -1, true, true);
+ atOnly, 0, -1, true);
}
int cmMakefile::ConfigureFile(const char* infile, const char* outfile,
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 3f24c48..45f3b9f 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -673,7 +673,7 @@ public:
const char* filename = 0,
long line = -1,
bool removeEmpty = false,
- bool replaceAt = false) const;
+ bool replaceAt = true) const;
/**
* Remove any remaining variables in the string. Anything with ${var} or
@@ -971,7 +971,6 @@ private:
mutable cmsys::RegularExpression cmDefineRegex;
mutable cmsys::RegularExpression cmDefine01Regex;
mutable cmsys::RegularExpression cmAtVarRegex;
- mutable cmsys::RegularExpression cmNamedCurly;
cmPropertyMap Properties;
@@ -1028,28 +1027,6 @@ private:
// Enforce rules about CMakeLists.txt files.
void EnforceDirectoryLevelRules() const;
- // CMP0052 == old
- cmake::MessageType ExpandVariablesInStringOld(
- std::string& errorstr,
- std::string& source,
- bool escapeQuotes,
- bool noEscapes,
- bool atOnly,
- const char* filename,
- long line,
- bool removeEmpty,
- bool replaceAt) const;
- // CMP0052 == new
- cmake::MessageType ExpandVariablesInStringNew(
- std::string& errorstr,
- std::string& source,
- bool escapeQuotes,
- bool noEscapes,
- bool atOnly,
- const char* filename,
- long line,
- bool removeEmpty,
- bool replaceAt) const;
bool GeneratingBuildSystem;
/**
* Old version of GetSourceFileWithOutput(const char*) kept for
diff --git a/Source/cmPolicies.cxx b/Source/cmPolicies.cxx
index eec9903..93072f5 100644
--- a/Source/cmPolicies.cxx
+++ b/Source/cmPolicies.cxx
@@ -343,11 +343,6 @@ cmPolicies::cmPolicies()
CMP0050, "CMP0050",
"Disallow add_custom_command SOURCE signatures.",
3,0,0, cmPolicies::WARN);
-
- this->DefinePolicy(
- CMP0052, "CMP0052",
- "Use the new variable expansion rules.",
- 3,1,0, cmPolicies::WARN);
}
cmPolicies::~cmPolicies()
diff --git a/Source/cmPolicies.h b/Source/cmPolicies.h
index 001fd45..b77235d 100644
--- a/Source/cmPolicies.h
+++ b/Source/cmPolicies.h
@@ -105,8 +105,6 @@ public:
CMP0049, ///< Do not expand variables in target source entries
CMP0050, ///< Disallow add_custom_command SOURCE signatures
- CMP0052, ///< Use the new EVIS parser and rules
-
/** \brief Always the last entry.
*
* Useful mostly to avoid adding a comma the last policy when adding a new
diff --git a/Tests/RunCMake/CMP0052/CMP0052-At-NEW-stderr.txt b/Tests/RunCMake/CMP0052/CMP0052-At-NEW-stderr.txt
deleted file mode 100644
index e3e5332..0000000
--- a/Tests/RunCMake/CMP0052/CMP0052-At-NEW-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^-->\${right}<--$
diff --git a/Tests/RunCMake/CMP0052/CMP0052-At-NEW.cmake b/Tests/RunCMake/CMP0052/CMP0052-At-NEW.cmake
deleted file mode 100644
index 5a3de4f..0000000
--- a/Tests/RunCMake/CMP0052/CMP0052-At-NEW.cmake
+++ /dev/null
@@ -1,9 +0,0 @@
-cmake_policy(SET CMP0052 NEW)
-
-set(right "wrong")
-set(var "\${right}")
-# Not expanded here with the new policy.
-set(ref "@var@")
-
-string(CONFIGURE "${ref}" output)
-message("-->${output}<--")
diff --git a/Tests/RunCMake/CMP0052/CMP0052-At-OLD-stderr.txt b/Tests/RunCMake/CMP0052/CMP0052-At-OLD-stderr.txt
deleted file mode 100644
index acfa30a..0000000
--- a/Tests/RunCMake/CMP0052/CMP0052-At-OLD-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^-->wrong<--$
diff --git a/Tests/RunCMake/CMP0052/CMP0052-At-OLD.cmake b/Tests/RunCMake/CMP0052/CMP0052-At-OLD.cmake
deleted file mode 100644
index e40a5d1..0000000
--- a/Tests/RunCMake/CMP0052/CMP0052-At-OLD.cmake
+++ /dev/null
@@ -1,9 +0,0 @@
-cmake_policy(SET CMP0052 OLD)
-
-set(right "wrong")
-set(var "\${right}")
-# Expanded here with the old policy.
-set(ref "@var@")
-
-string(CONFIGURE "${ref}" output)
-message("-->${output}<--")
diff --git a/Tests/RunCMake/CMP0052/CMP0052-At-WARN-stderr.txt b/Tests/RunCMake/CMP0052/CMP0052-At-WARN-stderr.txt
deleted file mode 100644
index 78315a8..0000000
--- a/Tests/RunCMake/CMP0052/CMP0052-At-WARN-stderr.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-^CMake Warning \(dev\) at CMP0052-At-WARN.cmake:4 \(set\):
- Policy CMP0052 is not set: Use the new variable expansion rules. Run
- "cmake --help-policy CMP0052" for policy details. Use the cmake_policy
- command to set the policy and suppress this warning.
-
- Input: '@var@'
- Old expansion: '\${right}'
- New expansion: '@var@'
-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/CMP0052/CMP0052-At-WARN.cmake b/Tests/RunCMake/CMP0052/CMP0052-At-WARN.cmake
deleted file mode 100644
index 19c7f53..0000000
--- a/Tests/RunCMake/CMP0052/CMP0052-At-WARN.cmake
+++ /dev/null
@@ -1,4 +0,0 @@
-set(right "wrong")
-set(var "\${right}")
-# Expanded here with the old policy.
-set(ref "@var@")
diff --git a/Tests/RunCMake/CMP0052/CMakeLists.txt b/Tests/RunCMake/CMP0052/CMakeLists.txt
deleted file mode 100644
index 667561e..0000000
--- a/Tests/RunCMake/CMP0052/CMakeLists.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-cmake_minimum_required(VERSION 2.8.12)
-project(${RunCMake_TEST} NONE)
-include(${RunCMake_TEST}.cmake NO_POLICY_SCOPE)
diff --git a/Tests/RunCMake/CMP0052/RunCMakeTest.cmake b/Tests/RunCMake/CMP0052/RunCMakeTest.cmake
deleted file mode 100644
index 8e82458..0000000
--- a/Tests/RunCMake/CMP0052/RunCMakeTest.cmake
+++ /dev/null
@@ -1,5 +0,0 @@
-include(RunCMake)
-
-run_cmake(CMP0052-At-OLD)
-run_cmake(CMP0052-At-NEW)
-run_cmake(CMP0052-At-WARN)
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index cf01fa6..9bb097b 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -34,7 +34,6 @@ add_RunCMake_test(CMP0045)
add_RunCMake_test(CMP0046)
add_RunCMake_test(CMP0049)
add_RunCMake_test(CMP0050)
-add_RunCMake_test(CMP0052)
add_RunCMake_test(CTest)
if(UNIX AND "${CMAKE_TEST_GENERATOR}" MATCHES "Unix Makefiles")
add_RunCMake_test(CompilerChange)
diff --git a/Tests/RunCMake/Syntax/ParenInVarName0-result.txt b/Tests/RunCMake/Syntax/ParenInVarName0-result.txt
deleted file mode 100644
index d00491f..0000000
--- a/Tests/RunCMake/Syntax/ParenInVarName0-result.txt
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/Tests/RunCMake/Syntax/ParenInVarName0-stderr.txt b/Tests/RunCMake/Syntax/ParenInVarName0-stderr.txt
deleted file mode 100644
index 2f117cd..0000000
--- a/Tests/RunCMake/Syntax/ParenInVarName0-stderr.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-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
deleted file mode 100644
index a10c095..0000000
--- a/Tests/RunCMake/Syntax/ParenInVarName0.cmake
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100644
index d00491f..0000000
--- a/Tests/RunCMake/Syntax/ParenInVarName1-result.txt
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/Tests/RunCMake/Syntax/ParenInVarName1-stderr.txt b/Tests/RunCMake/Syntax/ParenInVarName1-stderr.txt
deleted file mode 100644
index 81b1717..0000000
--- a/Tests/RunCMake/Syntax/ParenInVarName1-stderr.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-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
deleted file mode 100644
index 4e7185d..0000000
--- a/Tests/RunCMake/Syntax/ParenInVarName1.cmake
+++ /dev/null
@@ -1,4 +0,0 @@
-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 d2986df..5f05cfc 100644
--- a/Tests/RunCMake/Syntax/RunCMakeTest.cmake
+++ b/Tests/RunCMake/Syntax/RunCMakeTest.cmake
@@ -46,14 +46,9 @@ 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)
-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
deleted file mode 100644
index d00491f..0000000
--- a/Tests/RunCMake/Syntax/UnterminatedBrace0-result.txt
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/Tests/RunCMake/Syntax/UnterminatedBrace0-stderr.txt b/Tests/RunCMake/Syntax/UnterminatedBrace0-stderr.txt
deleted file mode 100644
index 1e0ce49..0000000
--- a/Tests/RunCMake/Syntax/UnterminatedBrace0-stderr.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-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
deleted file mode 100644
index 0da1290..0000000
--- a/Tests/RunCMake/Syntax/UnterminatedBrace0.cmake
+++ /dev/null
@@ -1,2 +0,0 @@
-cmake_minimum_required(VERSION 3.0)
-set(var "${")
diff --git a/Tests/RunCMake/Syntax/UnterminatedBrace1-stderr.txt b/Tests/RunCMake/Syntax/UnterminatedBrace1-stderr.txt
deleted file mode 100644
index 4e3c2b5..0000000
--- a/Tests/RunCMake/Syntax/UnterminatedBrace1-stderr.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-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
deleted file mode 100644
index 93fba34..0000000
--- a/Tests/RunCMake/Syntax/UnterminatedBrace1.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index d00491f..0000000
--- a/Tests/RunCMake/Syntax/UnterminatedBrace2-result.txt
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/Tests/RunCMake/Syntax/UnterminatedBrace2-stderr.txt b/Tests/RunCMake/Syntax/UnterminatedBrace2-stderr.txt
deleted file mode 100644
index b332d34..0000000
--- a/Tests/RunCMake/Syntax/UnterminatedBrace2-stderr.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-CMake Error at UnterminatedBrace2.cmake:4 \(set\):
- Syntax error in cmake code at
-
- .*/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
deleted file mode 100644
index 2c88422..0000000
--- a/Tests/RunCMake/Syntax/UnterminatedBrace2.cmake
+++ /dev/null
@@ -1,4 +0,0 @@
-cmake_minimum_required(VERSION 3.0)
-cmake_policy(SET CMP0010 OLD)
-cmake_policy(SET CMP0052 NEW)
-set(var "${")
diff --git a/Utilities/Release/Cygwin/CMakeLists.txt b/Utilities/Release/Cygwin/CMakeLists.txt
index 73a8220..c59a6fa 100644
--- a/Utilities/Release/Cygwin/CMakeLists.txt
+++ b/Utilities/Release/Cygwin/CMakeLists.txt
@@ -14,9 +14,9 @@ message(STATUS "Using curses version: libncurses${MAX}")
configure_file("${CMake_SOURCE_DIR}/Utilities/Release/Cygwin/cygwin-setup.hint.in"
"${CMake_BINARY_DIR}/setup.hint")
configure_file("${CMake_SOURCE_DIR}/Utilities/Release/Cygwin/README.cygwin.in"
- "${CMake_BINARY_DIR}/Docs/${CPACK_PACKAGE_FILE_NAME}-${CPACK_CYGWIN_PATCH_NUMBER}.README")
+ "${CMake_BINARY_DIR}/Docs/@CPACK_PACKAGE_FILE_NAME at -@CPACK_CYGWIN_PATCH_NUMBER at .README")
install_files(/share/doc/Cygwin FILES
- ${CMake_BINARY_DIR}/Docs/${CPACK_PACKAGE_FILE_NAME}-${CPACK_CYGWIN_PATCH_NUMBER}.README
+ ${CMake_BINARY_DIR}/Docs/@CPACK_PACKAGE_FILE_NAME at -@CPACK_CYGWIN_PATCH_NUMBER at .README
)
configure_file("${CMake_SOURCE_DIR}/Utilities/Release/Cygwin/cygwin-package.sh.in"
${CPACK_CYGWIN_BUILD_SCRIPT})
-----------------------------------------------------------------------
Summary of changes:
Help/manual/cmake-policies.7.rst | 1 -
Help/policy/CMP0010.rst | 3 -
Help/policy/CMP0052.rst | 26 --
Help/release/dev/faster-evis.rst | 6 -
Source/cmMakefile.cxx | 419 +-------------------
Source/cmMakefile.h | 25 +-
Source/cmPolicies.cxx | 5 -
Source/cmPolicies.h | 2 -
Tests/RunCMake/CMP0052/CMP0052-At-NEW-stderr.txt | 1 -
Tests/RunCMake/CMP0052/CMP0052-At-NEW.cmake | 9 -
Tests/RunCMake/CMP0052/CMP0052-At-OLD-stderr.txt | 1 -
Tests/RunCMake/CMP0052/CMP0052-At-OLD.cmake | 9 -
Tests/RunCMake/CMP0052/CMP0052-At-WARN-stderr.txt | 11 -
Tests/RunCMake/CMP0052/CMP0052-At-WARN.cmake | 4 -
Tests/RunCMake/CMP0052/CMakeLists.txt | 3 -
Tests/RunCMake/CMP0052/RunCMakeTest.cmake | 5 -
Tests/RunCMake/CMakeLists.txt | 1 -
Tests/RunCMake/Syntax/ParenInVarName0-result.txt | 1 -
Tests/RunCMake/Syntax/ParenInVarName0-stderr.txt | 12 -
Tests/RunCMake/Syntax/ParenInVarName0.cmake | 4 -
Tests/RunCMake/Syntax/ParenInVarName1-result.txt | 1 -
Tests/RunCMake/Syntax/ParenInVarName1-stderr.txt | 12 -
Tests/RunCMake/Syntax/ParenInVarName1.cmake | 4 -
Tests/RunCMake/Syntax/RunCMakeTest.cmake | 5 -
.../RunCMake/Syntax/UnterminatedBrace0-result.txt | 1 -
.../RunCMake/Syntax/UnterminatedBrace0-stderr.txt | 12 -
Tests/RunCMake/Syntax/UnterminatedBrace0.cmake | 2 -
.../RunCMake/Syntax/UnterminatedBrace1-stderr.txt | 13 -
Tests/RunCMake/Syntax/UnterminatedBrace1.cmake | 3 -
.../RunCMake/Syntax/UnterminatedBrace2-result.txt | 1 -
.../RunCMake/Syntax/UnterminatedBrace2-stderr.txt | 12 -
Tests/RunCMake/Syntax/UnterminatedBrace2.cmake | 4 -
Utilities/Release/Cygwin/CMakeLists.txt | 4 +-
33 files changed, 19 insertions(+), 603 deletions(-)
delete mode 100644 Help/policy/CMP0052.rst
delete mode 100644 Help/release/dev/faster-evis.rst
delete mode 100644 Tests/RunCMake/CMP0052/CMP0052-At-NEW-stderr.txt
delete mode 100644 Tests/RunCMake/CMP0052/CMP0052-At-NEW.cmake
delete mode 100644 Tests/RunCMake/CMP0052/CMP0052-At-OLD-stderr.txt
delete mode 100644 Tests/RunCMake/CMP0052/CMP0052-At-OLD.cmake
delete mode 100644 Tests/RunCMake/CMP0052/CMP0052-At-WARN-stderr.txt
delete mode 100644 Tests/RunCMake/CMP0052/CMP0052-At-WARN.cmake
delete mode 100644 Tests/RunCMake/CMP0052/CMakeLists.txt
delete mode 100644 Tests/RunCMake/CMP0052/RunCMakeTest.cmake
delete mode 100644 Tests/RunCMake/Syntax/ParenInVarName0-result.txt
delete mode 100644 Tests/RunCMake/Syntax/ParenInVarName0-stderr.txt
delete mode 100644 Tests/RunCMake/Syntax/ParenInVarName0.cmake
delete mode 100644 Tests/RunCMake/Syntax/ParenInVarName1-result.txt
delete mode 100644 Tests/RunCMake/Syntax/ParenInVarName1-stderr.txt
delete mode 100644 Tests/RunCMake/Syntax/ParenInVarName1.cmake
delete mode 100644 Tests/RunCMake/Syntax/UnterminatedBrace0-result.txt
delete mode 100644 Tests/RunCMake/Syntax/UnterminatedBrace0-stderr.txt
delete mode 100644 Tests/RunCMake/Syntax/UnterminatedBrace0.cmake
delete mode 100644 Tests/RunCMake/Syntax/UnterminatedBrace1-stderr.txt
delete mode 100644 Tests/RunCMake/Syntax/UnterminatedBrace1.cmake
delete mode 100644 Tests/RunCMake/Syntax/UnterminatedBrace2-result.txt
delete mode 100644 Tests/RunCMake/Syntax/UnterminatedBrace2-stderr.txt
delete mode 100644 Tests/RunCMake/Syntax/UnterminatedBrace2.cmake
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list