[Cmake-commits] CMake branch, next, updated. v2.8.12.2-7745-gafecbdd
Stephen Kelly
steveire at gmail.com
Mon Feb 17 05:17:19 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 afecbdd24214d648053074e9dea504246e23ddb3 (commit)
via c0ea4c5c6f79a0e0a808f79abeea4464d05dae03 (commit)
via 5e0c73c78c8e0f2fdf23c1e04b14cb656a065811 (commit)
via 907c09cd312e60d10f7af9342ad88e550af5e36c (commit)
via a74d125a7c67b7e4de9bd707b8c2a6d669a34fec (commit)
via 317d8498aa02c9f486bf5071963bb2034777cdd6 (commit)
from b463e302abb52be95cffb21bab6945ffda4abf50 (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=afecbdd24214d648053074e9dea504246e23ddb3
commit afecbdd24214d648053074e9dea504246e23ddb3
Merge: b463e30 c0ea4c5
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Feb 17 05:17:18 2014 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 17 05:17:18 2014 -0500
Merge topic 'minor-cleanups' into next
c0ea4c5c Makefile: Fix comment indentation.
5e0c73c7 cmGlobalGenerator: Remove unused variable.
907c09cd include_directory: Add missing include.
a74d125a Help: Fix typo
317d8498 Small typo fix
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c0ea4c5c6f79a0e0a808f79abeea4464d05dae03
commit c0ea4c5c6f79a0e0a808f79abeea4464d05dae03
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Feb 17 11:14:18 2014 +0100
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Feb 17 11:14:18 2014 +0100
Makefile: Fix comment indentation.
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index 7f90078..c3ca85d 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -344,7 +344,7 @@ void cmMakefileTargetGenerator::WriteTargetLanguageFlags()
// write language flags for target
std::set<cmStdString> languages;
this->Target->GetLanguages(languages);
- // put the compiler in the rules.make file so that if it changes
+ // put the compiler in the rules.make file so that if it changes
// things rebuild
for(std::set<cmStdString>::const_iterator l = languages.begin();
l != languages.end(); ++l)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5e0c73c78c8e0f2fdf23c1e04b14cb656a065811
commit 5e0c73c78c8e0f2fdf23c1e04b14cb656a065811
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Feb 17 11:13:44 2014 +0100
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Feb 17 11:13:44 2014 +0100
cmGlobalGenerator: Remove unused variable.
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index a61cab1..7d98734 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -2911,7 +2911,6 @@ void cmGlobalGenerator::WriteSummary()
cmGeneratedFileStream fout(fname.c_str());
// Generate summary information files for each target.
- std::string dir;
for(std::map<cmStdString,cmTarget *>::const_iterator ti =
this->TotalTargets.begin(); ti != this->TotalTargets.end(); ++ti)
{
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=907c09cd312e60d10f7af9342ad88e550af5e36c
commit 907c09cd312e60d10f7af9342ad88e550af5e36c
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Feb 17 11:08:58 2014 +0100
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Feb 17 11:08:58 2014 +0100
include_directory: Add missing include.
The cmGeneratorExpression is used here, but the header for it is not
in the include heirarchy. This would be a compile error if the file
were compiled as a standalone translation unit, but it is instead
used in a mini-unity-build by inclusion in cmCommands.cxx. The header
for cmGeneratorExpression happens to be included first, so the
compilation works fine.
IDEs do not know this however, and flag the use as an error.
diff --git a/Source/cmTargetIncludeDirectoriesCommand.cxx b/Source/cmTargetIncludeDirectoriesCommand.cxx
index 913bdab..f8e1188 100644
--- a/Source/cmTargetIncludeDirectoriesCommand.cxx
+++ b/Source/cmTargetIncludeDirectoriesCommand.cxx
@@ -11,6 +11,8 @@
============================================================================*/
#include "cmTargetIncludeDirectoriesCommand.h"
+#include "cmGeneratorExpression.h"
+
//----------------------------------------------------------------------------
bool cmTargetIncludeDirectoriesCommand
::InitialPass(std::vector<std::string> const& args, cmExecutionStatus &)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a74d125a7c67b7e4de9bd707b8c2a6d669a34fec
commit a74d125a7c67b7e4de9bd707b8c2a6d669a34fec
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Feb 17 11:07:59 2014 +0100
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Feb 17 11:07:59 2014 +0100
Help: Fix typo
binary_find -> binary_search.
diff --git a/Help/manual/cmake-developer.7.rst b/Help/manual/cmake-developer.7.rst
index 887047c..376b56c 100644
--- a/Help/manual/cmake-developer.7.rst
+++ b/Help/manual/cmake-developer.7.rst
@@ -84,7 +84,7 @@ In some implementations, algorithms operating on iterators to a container of
const char* dir = /*...*/;
std::vector<std::string> vec;
// ...
- std::binary_find(vec.begin(), vec.end(), dir); // Wrong
+ std::binary_search(vec.begin(), vec.end(), dir); // Wrong
The ``std::string`` may need to be explicitly constructed:
@@ -93,7 +93,7 @@ The ``std::string`` may need to be explicitly constructed:
const char* dir = /*...*/;
std::vector<std::string> vec;
// ...
- std::binary_find(vec.begin(), vec.end(), std::string(dir)); // Ok
+ std::binary_search(vec.begin(), vec.end(), std::string(dir)); // Ok
std::auto_ptr
-------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=317d8498aa02c9f486bf5071963bb2034777cdd6
commit 317d8498aa02c9f486bf5071963bb2034777cdd6
Author: Kevin Funk <kfunk at kde.org>
AuthorDate: Mon Feb 17 11:02:28 2014 +0100
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Feb 17 11:07:41 2014 +0100
Small typo fix
diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index ab194c3..dfb310e 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -1512,7 +1512,7 @@ void cmQtAutoGenerators::ParseCppFile(const std::string& absFilename,
}
else
{
- std::cerr << "AUTOGEN: error: " << absFilename << " The file "
+ std::cerr << "AUTOGEN: error: " << absFilename << ": The file "
<< "includes the moc file \"" << currentMoc << "\", "
<< "but could not find header \"" << basename
<< '{' << this->Join(headerExtensions, ',') << "}\" ";
-----------------------------------------------------------------------
Summary of changes:
Help/manual/cmake-developer.7.rst | 4 ++--
Source/cmGlobalGenerator.cxx | 1 -
Source/cmMakefileTargetGenerator.cxx | 2 +-
Source/cmQtAutoGenerators.cxx | 2 +-
Source/cmTargetIncludeDirectoriesCommand.cxx | 2 ++
5 files changed, 6 insertions(+), 5 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list