[Cmake-commits] CMake branch, next, updated. v2.8.10.2-1850-gd36b141

[Stephen Kelly]

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  d36b14199f4757a1d785fe059968dda434552d22 (commit)
       via  8dc3e73e6778cacc60aa6162d23eaf174ee88536 (commit)
      from  890d45859885661b59d211b1acf0058c5b44c76d (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=d36b14199f4757a1d785fe059968dda434552d22
commit d36b14199f4757a1d785fe059968dda434552d22
Merge: 890d458 8dc3e73
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Feb 2 07:11:24 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Feb 2 07:11:24 2013 -0500

    Merge topic 'fix-include-directories-unix-path' into next
    
    8dc3e73 Use the result of converting to a unix path.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8dc3e73e6778cacc60aa6162d23eaf174ee88536
commit 8dc3e73e6778cacc60aa6162d23eaf174ee88536
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Feb 2 12:46:30 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Feb 2 13:10:21 2013 +0100

    Use the result of converting to a unix path.

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:
 Source/cmTarget.cxx |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake