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 86a6d55ddc0c2bc59e80a697c2656dbf610df366 (commit)
via bdb62f63099d2cad264a963a5e57020cbd157ddb (commit)
from b6d0e87352b2fda6a5e6a542f7433ca9e0ac62e4 (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=86a6d55ddc0c2bc59e80a697c2656dbf610df366
commit 86a6d55ddc0c2bc59e80a697c2656dbf610df366
Merge: b6d0e87 bdb62f6
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Mon Jan 21 03:12:06 2013 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Mon Jan 21 03:12:06 2013 -0500
Merge topic 'clean-include-dirs-debugging' into next
bdb62f6 Don't use insert on a std::set with a range.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bdb62f63099d2cad264a963a5e57020cbd157ddb
commit bdb62f63099d2cad264a963a5e57020cbd157ddb
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Mon Jan 21 09:09:54 2013 +0100
Commit: Stephen Kelly <steve...@gmail.com>
CommitDate: Mon Jan 21 09:11:39 2013 +0100
Don't use insert on a std::set with a range.
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index f5aa932..4721e4c 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -1657,7 +1657,11 @@ void cmMakefile::AddIncludeDirectories(const
std::vector<std::string> &incs,
void
cmMakefile::AddSystemIncludeDirectories(const std::set<cmStdString> &incs)
{
- this->SystemIncludeDirectories.insert(incs.begin(), incs.end());
+ for(std::set<cmStdString>::const_iterator li = incs.begin();
+ li != incs.end(); ++li)
+ {
+ this->SystemIncludeDirectories.insert(*li);
+ }
}
//----------------------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
Source/cmMakefile.cxx | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
