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 ecf98d6938cf694c9a395667f1bbcb883c62bf0a (commit)
via bde3b4d4637a486fde8a3ae9ae7a3ed9dd32e6f8 (commit)
from bb7ed99d5d14027daf888647c0456dc9d7941a7c (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=ecf98d6938cf694c9a395667f1bbcb883c62bf0a
commit ecf98d6938cf694c9a395667f1bbcb883c62bf0a
Merge: bb7ed99 bde3b4d
Author: Rolf Eike Beer <e...@sf-mail.de>
AuthorDate: Thu Jan 16 02:43:37 2014 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Thu Jan 16 02:43:37 2014 -0500
Merge topic 'cmmakefile-const' into next
bde3b4d4 fix line length
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bde3b4d4637a486fde8a3ae9ae7a3ed9dd32e6f8
commit bde3b4d4637a486fde8a3ae9ae7a3ed9dd32e6f8
Author: Rolf Eike Beer <k...@opensource.sf-tec.de>
AuthorDate: Thu Jan 16 08:43:17 2014 +0100
Commit: Rolf Eike Beer <k...@opensource.sf-tec.de>
CommitDate: Thu Jan 16 08:43:17 2014 +0100
fix line length
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index b97372d..222cdb6 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -3859,7 +3859,8 @@ const char* cmMakefile::GetFeature(const char* feature,
const char* config)
return 0;
}
-cmTarget* cmMakefile::FindTarget(const std::string& name, bool excludeAliases)
const
+cmTarget* cmMakefile::FindTarget(const std::string& name,
+ bool excludeAliases) const
{
if (!excludeAliases)
{
@@ -4063,7 +4064,8 @@ cmMakefile::AddImportedTarget(const char* name,
cmTarget::TargetType type,
}
//----------------------------------------------------------------------------
-cmTarget* cmMakefile::FindTargetToUse(const std::string& name, bool
excludeAliases)
+cmTarget* cmMakefile::FindTargetToUse(const std::string& name,
+ bool excludeAliases)
{
// Look for an imported target. These take priority because they
// are more local in scope and do not have to be globally unique.
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 8d613e4..0232ffe 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -533,11 +533,13 @@ public:
this->GeneratorTargets = targets;
}
- cmTarget* FindTarget(const std::string& name, bool excludeAliases = false)
const;
+ cmTarget* FindTarget(const std::string& name,
+ bool excludeAliases = false) const;
/** Find a target to use in place of the given name. The target
returned may be imported or built within the project. */
- cmTarget* FindTargetToUse(const std::string& name, bool excludeAliases =
false);
+ cmTarget* FindTargetToUse(const std::string& name,
+ bool excludeAliases = false);
bool IsAlias(const std::string& name);
cmGeneratorTarget* FindGeneratorTargetToUse(const char* name);
-----------------------------------------------------------------------
Summary of changes:
Source/cmMakefile.cxx | 6 ++++--
Source/cmMakefile.h | 6 ++++--
2 files changed, 8 insertions(+), 4 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
