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 e64384aef351ebe552f842bc7e198bb06391e073 (commit)
via b6f66542674cac75821dfb10677bf52318afcda5 (commit)
from 41454ad8ea356b0611a93b91ea19dda6a6804523 (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=e64384aef351ebe552f842bc7e198bb06391e073
commit e64384aef351ebe552f842bc7e198bb06391e073
Merge: 41454ad b6f6654
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Feb 5 03:22:55 2013 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 5 03:22:55 2013 -0500
Merge topic 'fix-include-directories-unix-path' into next
b6f6654 Use the result of converting to a unix path.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b6f66542674cac75821dfb10677bf52318afcda5
commit b6f66542674cac75821dfb10677bf52318afcda5
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Feb 2 12:46:30 2013 +0100
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Feb 5 09:19:27 2013 +0100
Use the result of converting to a unix path.
The commit 18a3195a ('Keep track of INCLUDE_DIRECTORIES as a vector
of structs.', 2012-11-19) moved the handling of includes from
cmGeneratorTarget to cmTarget, but in the process introduced this
bug.
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 5669872..132154c 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -2797,10 +2797,10 @@ std::vector<std::string> cmTarget::GetIncludeDirectories(const char *config)
if(uniqueIncludes.insert(inc).second)
{
- includes.push_back(*li);
+ includes.push_back(inc);
if (debugIncludes)
{
- usedIncludes += " * " + *li + "\n";
+ usedIncludes += " * " + inc + "\n";
}
}
}
-----------------------------------------------------------------------
Summary of changes:
hooks/post-receive
--
CMake