[Cmake-commits] CMake branch, next, updated. v3.0.0-rc1-1134-g8f4867c
Stephen Kelly
steveire at gmail.com
Mon Mar 17 10:40:57 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 8f4867c9607a3cb71d200e143f8b8683466bc43c (commit)
via 19012b4652953ea8d8a470d1790419b1d8682850 (commit)
via 10e6f1e716758c5ad5dcb63a5c69551ff3b9f6ff (commit)
via c3a2f78b5a322bd14123cb301dc62dc3b58073b5 (commit)
via 2e0611f981f17889cb701db2ffd9436c771bb7e1 (commit)
via d83ef53a1293899c0ab58aca184b7d5866051876 (commit)
from e5eb2ec325484e7f6b1d1e4bbca0d6667aa8be89 (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=8f4867c9607a3cb71d200e143f8b8683466bc43c
commit 8f4867c9607a3cb71d200e143f8b8683466bc43c
Merge: e5eb2ec 19012b4
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Mar 17 10:40:56 2014 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Mar 17 10:40:56 2014 -0400
Merge topic 'minor_cleanups' into next
19012b46 cmMakefile: Fix style.
10e6f1e7 cmMakefile: Fix typo in comment.
c3a2f78b Makefiles: Remove duplicate code.
2e0611f9 cmGeneratorExpression: Remove unused include.
d83ef53a Rename local 'dir_max' variables to 'dir'
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=19012b4652953ea8d8a470d1790419b1d8682850
commit 19012b4652953ea8d8a470d1790419b1d8682850
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Mar 17 15:34:53 2014 +0100
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Mar 17 15:34:53 2014 +0100
cmMakefile: Fix style.
Use this-> for member access.
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index f312399..f390237 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -2101,7 +2101,7 @@ cmSourceFile *cmMakefile::GetSourceFileWithOutput(
// linear-time search for an output with a matching suffix.
if(!cmSystemTools::FileIsFullPath(name.c_str()))
{
- return LinearGetSourceFileWithOutput(name);
+ return this->LinearGetSourceFileWithOutput(name);
}
// Otherwise we use an efficient lookup map.
OutputToSourceMap::const_iterator o = this->OutputToSource.find(name);
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=10e6f1e716758c5ad5dcb63a5c69551ff3b9f6ff
commit 10e6f1e716758c5ad5dcb63a5c69551ff3b9f6ff
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Mar 17 15:33:54 2014 +0100
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Mar 17 15:33:54 2014 +0100
cmMakefile: Fix typo in comment.
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 58625fb..f312399 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -2071,7 +2071,7 @@ cmMakefile::LinearGetSourceFileWithOutput(const std::string& name) const
// does this source file have a custom command?
if ((*i)->GetCustomCommand())
{
- // is the output of the custom command match the source files name
+ // Does the output of the custom command match the source file name?
const std::vector<std::string>& outputs =
(*i)->GetCustomCommand()->GetOutputs();
for(std::vector<std::string>::const_iterator o = outputs.begin();
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c3a2f78b5a322bd14123cb301dc62dc3b58073b5
commit c3a2f78b5a322bd14123cb301dc62dc3b58073b5
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Mar 17 15:32:19 2014 +0100
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Mar 17 15:32:19 2014 +0100
Makefiles: Remove duplicate code.
The cmGlobalUnixMakefileGenerator3::ProgressMapCompare struct is
logically equivalent to cmStrictTargetComparison.
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index e37ee10..3aa293e 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -958,21 +958,6 @@ cmGlobalUnixMakefileGenerator3::RecordTargetProgress(
}
//----------------------------------------------------------------------------
-bool
-cmGlobalUnixMakefileGenerator3::ProgressMapCompare
-::operator()(cmTarget const* l, cmTarget const* r) const
-{
- // Order by target name.
- if(int c = strcmp(l->GetName().c_str(), r->GetName().c_str()))
- {
- return c < 0;
- }
- // Order duplicate targets by binary directory.
- return strcmp(l->GetMakefile()->GetCurrentOutputDirectory(),
- r->GetMakefile()->GetCurrentOutputDirectory()) < 0;
-}
-
-//----------------------------------------------------------------------------
void
cmGlobalUnixMakefileGenerator3::TargetProgress
::WriteProgressVariables(unsigned long total, unsigned long ¤t)
diff --git a/Source/cmGlobalUnixMakefileGenerator3.h b/Source/cmGlobalUnixMakefileGenerator3.h
index d003789..f44dd12 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.h
+++ b/Source/cmGlobalUnixMakefileGenerator3.h
@@ -185,10 +185,8 @@ protected:
std::vector<unsigned long> Marks;
void WriteProgressVariables(unsigned long total, unsigned long& current);
};
- struct ProgressMapCompare { bool operator()(cmTarget const*,
- cmTarget const*) const; };
typedef std::map<cmTarget const*, TargetProgress,
- ProgressMapCompare> ProgressMapType;
+ cmStrictTargetComparison> ProgressMapType;
ProgressMapType ProgressMap;
size_t CountProgressMarksInTarget(cmTarget const* target,
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2e0611f981f17889cb701db2ffd9436c771bb7e1
commit 2e0611f981f17889cb701db2ffd9436c771bb7e1
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Mar 17 15:29:49 2014 +0100
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Mar 17 15:29:49 2014 +0100
cmGeneratorExpression: Remove unused include.
diff --git a/Source/cmGeneratorExpression.h b/Source/cmGeneratorExpression.h
index 5b97e8b..d0a6aef 100644
--- a/Source/cmGeneratorExpression.h
+++ b/Source/cmGeneratorExpression.h
@@ -16,8 +16,6 @@
#include "cmStandardIncludes.h"
#include "cmListFileCache.h"
-#include <stack>
-
#include <cmsys/RegularExpression.hxx>
#include <cmsys/auto_ptr.hxx>
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d83ef53a1293899c0ab58aca184b7d5866051876
commit d83ef53a1293899c0ab58aca184b7d5866051876
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Mar 17 15:27:01 2014 +0100
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Mar 17 15:27:01 2014 +0100
Rename local 'dir_max' variables to 'dir'
The code is not computing the maximum length directory, as is the
case in cmLocalVisualStudioGenerator::ComputeLongestObjectDirectory.
diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx
index 49ce1b5..88f1b08 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -639,12 +639,12 @@ void cmGlobalNinjaGenerator
cmTarget* target = gt->Target;
// Compute full path to object file directory for this target.
- std::string dir_max;
- dir_max += gt->Makefile->GetCurrentOutputDirectory();
- dir_max += "/";
- dir_max += gt->LocalGenerator->GetTargetDirectory(*target);
- dir_max += "/";
- gt->ObjectDirectory = dir_max;
+ std::string dir;
+ dir += gt->Makefile->GetCurrentOutputDirectory();
+ dir += "/";
+ dir += gt->LocalGenerator->GetTargetDirectory(*target);
+ dir += "/";
+ gt->ObjectDirectory = dir;
}
//----------------------------------------------------------------------------
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index 4632071..e37ee10 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -111,12 +111,12 @@ cmGlobalUnixMakefileGenerator3
cmTarget* target = gt->Target;
// Compute full path to object file directory for this target.
- std::string dir_max;
- dir_max += gt->Makefile->GetCurrentOutputDirectory();
- dir_max += "/";
- dir_max += gt->LocalGenerator->GetTargetDirectory(*target);
- dir_max += "/";
- gt->ObjectDirectory = dir_max;
+ std::string dir;
+ dir += gt->Makefile->GetCurrentOutputDirectory();
+ dir += "/";
+ dir += gt->LocalGenerator->GetTargetDirectory(*target);
+ dir += "/";
+ gt->ObjectDirectory = dir;
}
void cmGlobalUnixMakefileGenerator3::Configure()
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index 2d36089..6e2e6a8 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -202,11 +202,11 @@ GetLocalObjectFiles(std::map<std::string, LocalObjectInfo> &localObjectFiles)
std::vector<cmSourceFile const*> objectSources;
gt->GetObjectSources(objectSources);
// Compute full path to object file directory for this target.
- std::string dir_max;
- dir_max += gt->Makefile->GetCurrentOutputDirectory();
- dir_max += "/";
- dir_max += this->GetTargetDirectory(*gt->Target);
- dir_max += "/";
+ std::string dir;
+ dir += gt->Makefile->GetCurrentOutputDirectory();
+ dir += "/";
+ dir += this->GetTargetDirectory(*gt->Target);
+ dir += "/";
// Compute the name of each object file.
for(std::vector<cmSourceFile const*>::iterator
si = objectSources.begin();
@@ -215,7 +215,7 @@ GetLocalObjectFiles(std::map<std::string, LocalObjectInfo> &localObjectFiles)
cmSourceFile const* sf = *si;
bool hasSourceExtension = true;
std::string objectName = this->GetObjectFileNameWithoutTarget(*sf,
- dir_max,
+ dir,
&hasSourceExtension);
if(cmSystemTools::FileIsFullPath(objectName.c_str()))
{
-----------------------------------------------------------------------
Summary of changes:
Source/cmGeneratorExpression.h | 2 --
Source/cmGlobalNinjaGenerator.cxx | 12 ++++++------
Source/cmGlobalUnixMakefileGenerator3.cxx | 27 ++++++---------------------
Source/cmGlobalUnixMakefileGenerator3.h | 4 +---
Source/cmLocalUnixMakefileGenerator3.cxx | 12 ++++++------
Source/cmMakefile.cxx | 4 ++--
6 files changed, 21 insertions(+), 40 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list