[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3576-gde6899f
Stephen Kelly
steveire at gmail.com
Thu Aug 1 13:10:29 EDT 2013
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 de6899f241b4bd3030f8c60e81e3d1c073cffa5b (commit)
via 5450675bbc904a034872e9ef3923379f05d7eab5 (commit)
from bd1c269eba532e0b5576daa8342326b5ea3f270d (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=de6899f241b4bd3030f8c60e81e3d1c073cffa5b
commit de6899f241b4bd3030f8c60e81e3d1c073cffa5b
Merge: bd1c269 5450675
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Aug 1 13:10:17 2013 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Aug 1 13:10:17 2013 -0400
Merge topic 'ALIAS-targets' into next
5450675 Fix some line length issues.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5450675bbc904a034872e9ef3923379f05d7eab5
commit 5450675bbc904a034872e9ef3923379f05d7eab5
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Jul 12 09:14:31 2013 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Aug 1 19:09:34 2013 +0200
Fix some line length issues.
diff --git a/Source/cmAddExecutableCommand.cxx b/Source/cmAddExecutableCommand.cxx
index cf4f65c..8537276 100644
--- a/Source/cmAddExecutableCommand.cxx
+++ b/Source/cmAddExecutableCommand.cxx
@@ -129,7 +129,8 @@ bool cmAddExecutableCommand
{
cmOStringStream e;
e << "cannot create ALIAS target \"" << exename
- << "\" because target \"" << aliasedName << "\" does not already exist.";
+ << "\" because target \"" << aliasedName << "\" does not already "
+ "exist.";
this->SetError(e.str().c_str());
return false;
}
diff --git a/Source/cmAddLibraryCommand.cxx b/Source/cmAddLibraryCommand.cxx
index 5ba70a8..c6071b1 100644
--- a/Source/cmAddLibraryCommand.cxx
+++ b/Source/cmAddLibraryCommand.cxx
@@ -142,7 +142,8 @@ bool cmAddLibraryCommand
{
cmOStringStream e;
e << "cannot create ALIAS target \"" << libName
- << "\" because target \"" << aliasedName << "\" does not already exist.";
+ << "\" because target \"" << aliasedName << "\" does not already "
+ "exist.";
this->SetError(e.str().c_str());
return false;
}
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index d0d1025..7f2b592 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1783,7 +1783,8 @@ bool cmGlobalGenerator::IsAlias(const char *name)
//----------------------------------------------------------------------------
cmTarget*
-cmGlobalGenerator::FindTarget(const char* project, const char* name, bool excludeAliases)
+cmGlobalGenerator::FindTarget(const char* project, const char* name,
+ bool excludeAliases)
{
// if project specific
if(project)
@@ -1791,7 +1792,8 @@ cmGlobalGenerator::FindTarget(const char* project, const char* name, bool exclud
std::vector<cmLocalGenerator*>* gens = &this->ProjectMap[project];
for(unsigned int i = 0; i < gens->size(); ++i)
{
- cmTarget* ret = (*gens)[i]->GetMakefile()->FindTarget(name, excludeAliases);
+ cmTarget* ret = (*gens)[i]->GetMakefile()->FindTarget(name,
+ excludeAliases);
if(ret)
{
return ret;
@@ -1803,7 +1805,8 @@ cmGlobalGenerator::FindTarget(const char* project, const char* name, bool exclud
{
if (!excludeAliases)
{
- std::map<cmStdString, cmTarget*>::iterator ai = this->AliasTargets.find(name);
+ std::map<cmStdString, cmTarget*>::iterator ai
+ = this->AliasTargets.find(name);
if (ai != this->AliasTargets.end())
{
return ai->second;
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index ee80700..18aba24 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -196,7 +196,8 @@ public:
void FindMakeProgram(cmMakefile*);
///! Find a target by name by searching the local generators.
- cmTarget* FindTarget(const char* project, const char* name, bool excludeAliases = false);
+ cmTarget* FindTarget(const char* project, const char* name,
+ bool excludeAliases = false);
void AddAlias(const char *name, cmTarget *tgt);
bool IsAlias(const char *name);
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 15b4d92..aae92dd 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -3777,7 +3777,8 @@ cmTarget* cmMakefile::FindTarget(const char* name, bool excludeAliases)
{
if (!excludeAliases)
{
- std::map<std::string, cmTarget*>::iterator i = this->AliasTargets.find(name);
+ std::map<std::string, cmTarget*>::iterator i
+ = this->AliasTargets.find(name);
if (i != this->AliasTargets.end())
{
return i->second;
@@ -4225,7 +4226,8 @@ cmTarget* cmMakefile::FindTargetToUse(const char* name, bool excludeAliases)
}
// Look for a target built in this project.
- return this->LocalGenerator->GetGlobalGenerator()->FindTarget(0, name, excludeAliases);
+ return this->LocalGenerator->GetGlobalGenerator()->FindTarget(0, name,
+ excludeAliases);
}
//----------------------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
Source/cmAddExecutableCommand.cxx | 3 ++-
Source/cmAddLibraryCommand.cxx | 3 ++-
Source/cmGlobalGenerator.cxx | 9 ++++++---
Source/cmGlobalGenerator.h | 3 ++-
Source/cmMakefile.cxx | 6 ++++--
5 files changed, 16 insertions(+), 8 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list