[Cmake-commits] CMake branch, next, updated. v3.0.1-5192-g220eac8
Nils Gladitz
nilsgladitz at gmail.com
Mon Sep 8 11:32:22 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 220eac8b1ea3b9ee56fd4f989111a9001d1e76f2 (commit)
via 186dbfc2f4ec3d2dbac9a9ae30fa9dadff01b2ae (commit)
from dc72b62916a48c726847e8664e1dcb53c611200c (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=220eac8b1ea3b9ee56fd4f989111a9001d1e76f2
commit 220eac8b1ea3b9ee56fd4f989111a9001d1e76f2
Merge: dc72b62 186dbfc
Author: Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Mon Sep 8 11:32:21 2014 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Sep 8 11:32:21 2014 -0400
Merge topic 'if-sanity' into next
186dbfc2 If: Changed quoting in diagnostics and exclude names from deduplication
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=186dbfc2f4ec3d2dbac9a9ae30fa9dadff01b2ae
commit 186dbfc2f4ec3d2dbac9a9ae30fa9dadff01b2ae
Author: Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Mon Sep 8 17:31:58 2014 +0200
Commit: Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Mon Sep 8 17:31:58 2014 +0200
If: Changed quoting in diagnostics and exclude names from deduplication
diff --git a/Source/cmIfCommand.cxx b/Source/cmIfCommand.cxx
index 3cb463e..b1a68b5 100644
--- a/Source/cmIfCommand.cxx
+++ b/Source/cmIfCommand.cxx
@@ -242,14 +242,14 @@ namespace
case cmPolicies::WARN:
{
bool hasBeenReported = mf->HasCMP0054AlreadyBeenReported(
- mf->GetBacktrace()[0], argument.GetValue());
+ mf->GetBacktrace()[0]);
if(!hasBeenReported)
{
e << (mf->GetPolicies()->GetPolicyWarning(
cmPolicies::CMP0054)) << "\n";
- e << "Quoted keywords like '" << argument.GetValue() <<
- "' are no longer interpreted as keywords.";
+ e << "Quoted keywords like \"" << argument.GetValue() <<
+ "\" are no longer interpreted as keywords.";
mf->IssueMessage(cmake::AUTHOR_WARNING, e.str());
}
@@ -972,14 +972,14 @@ const char* cmIfCommand::GetDefinitionIfUnquoted(
case cmPolicies::WARN:
{
bool hasBeenReported = mf->HasCMP0054AlreadyBeenReported(
- mf->GetBacktrace()[0], argument.GetValue());
+ mf->GetBacktrace()[0]);
if(!hasBeenReported)
{
e << (mf->GetPolicies()->GetPolicyWarning(
cmPolicies::CMP0054)) << "\n";
- e << "Quoted variables like '" << argument.GetValue() <<
- "' are no longer dereferenced.";
+ e << "Quoted variables like \"" << argument.GetValue() <<
+ "\" are no longer dereferenced.";
mf->IssueMessage(cmake::AUTHOR_WARNING, e.str());
}
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 4b42946..3017d15 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -4999,9 +4999,9 @@ cmPolicies *cmMakefile::GetPolicies() const
//----------------------------------------------------------------------------
bool cmMakefile::HasCMP0054AlreadyBeenReported(
- cmListFileContext context, std::string name) const
+ cmListFileContext context) const
{
- cmCMP0054Id id(context, name);
+ cmCMP0054Id id(context);
bool alreadyReported =
this->CMP0054ReportedIds.find(id) != this->CMP0054ReportedIds.end();
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index a304450..164290a 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -380,9 +380,8 @@ public:
struct cmCMP0054Id
{
- cmCMP0054Id(cmListFileContext const& context, std::string const& name):
- Context(context),
- Name(name)
+ cmCMP0054Id(cmListFileContext const& context):
+ Context(context)
{
}
@@ -392,14 +391,10 @@ public:
if(this->Context.FilePath != id.Context.FilePath)
return this->Context.FilePath < id.Context.FilePath;
- if(this->Context.Line != id.Context.Line)
- return this->Context.Line < id.Context.Line;
-
- return this->Name < id.Name;
+ return this->Context.Line < id.Context.Line;
}
cmListFileContext Context;
- std::string Name;
};
mutable std::set<cmCMP0054Id> CMP0054ReportedIds;
@@ -409,7 +404,7 @@ public:
* in context of CMP0054.
*/
bool HasCMP0054AlreadyBeenReported(
- cmListFileContext context, std::string name) const;
+ cmListFileContext context) const;
/**
* Add an auxiliary directory to the build.
diff --git a/Tests/RunCMake/CMP0054/CMP0054-WARN-stderr.txt b/Tests/RunCMake/CMP0054/CMP0054-WARN-stderr.txt
index d076cab..a32636c 100644
--- a/Tests/RunCMake/CMP0054/CMP0054-WARN-stderr.txt
+++ b/Tests/RunCMake/CMP0054/CMP0054-WARN-stderr.txt
@@ -4,7 +4,7 @@ CMake Warning \(dev\) at CMP0054-WARN.cmake:3 \(if\):
details. Use the cmake_policy command to set the policy and suppress this
warning.
- Quoted variables like 'FOO' are no longer dereferenced.
+ Quoted variables like "FOO" are no longer dereferenced.
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/CMP0054/CMP0054-duplicate-warnings-stderr.txt b/Tests/RunCMake/CMP0054/CMP0054-duplicate-warnings-stderr.txt
index 1e33cf9..950d939 100644
--- a/Tests/RunCMake/CMP0054/CMP0054-duplicate-warnings-stderr.txt
+++ b/Tests/RunCMake/CMP0054/CMP0054-duplicate-warnings-stderr.txt
@@ -4,7 +4,7 @@ CMake Warning \(dev\) at CMP0054-duplicate-warnings.cmake:4 \(if\):
details. Use the cmake_policy command to set the policy and suppress this
warning.
- Quoted variables like 'FOO' are no longer dereferenced.
+ Quoted variables like "FOO" are no longer dereferenced.
Call Stack \(most recent call first\):
CMP0054-duplicate-warnings.cmake:8 \(generate_warning\)
CMakeLists.txt:3 \(include\)
@@ -16,7 +16,7 @@ CMake Warning \(dev\) at CMP0054-duplicate-warnings.cmake:11 \(if\):
details. Use the cmake_policy command to set the policy and suppress this
warning.
- Quoted variables like 'FOO' are no longer dereferenced.
+ Quoted variables like "FOO" are no longer dereferenced.
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/CMP0054/CMP0054-keywords-WARN-stderr.txt b/Tests/RunCMake/CMP0054/CMP0054-keywords-WARN-stderr.txt
index 5952f87..351db3a 100644
--- a/Tests/RunCMake/CMP0054/CMP0054-keywords-WARN-stderr.txt
+++ b/Tests/RunCMake/CMP0054/CMP0054-keywords-WARN-stderr.txt
@@ -4,7 +4,7 @@ CMake Warning \(dev\) at CMP0054-keywords-WARN.cmake:1 \(if\):
details. Use the cmake_policy command to set the policy and suppress this
warning.
- Quoted keywords like 'NOT' are no longer interpreted as keywords.
+ Quoted keywords like "NOT" are no longer interpreted as keywords.
Call Stack \(most recent call first\):
CMakeLists.txt:3 \(include\)
This warning is for project developers. Use -Wno-dev to suppress it.
-----------------------------------------------------------------------
Summary of changes:
Source/cmIfCommand.cxx | 12 ++++++------
Source/cmMakefile.cxx | 4 ++--
Source/cmMakefile.h | 13 ++++---------
Tests/RunCMake/CMP0054/CMP0054-WARN-stderr.txt | 2 +-
.../CMP0054/CMP0054-duplicate-warnings-stderr.txt | 4 ++--
Tests/RunCMake/CMP0054/CMP0054-keywords-WARN-stderr.txt | 2 +-
6 files changed, 16 insertions(+), 21 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list