[Cmake-commits] CMake branch, next, updated. v2.8.7-2824-ga4e84bd

[David Cole]

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  a4e84bdf90d68dd54cc201e5007a6c96def7d11d (commit)
       via  d662dff7690ae4a3b22947f07de4fc952c33e568 (commit)
      from  506a26e175a145d47b6af38f0b4c12b329d55724 (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=a4e84bdf90d68dd54cc201e5007a6c96def7d11d
commit a4e84bdf90d68dd54cc201e5007a6c96def7d11d
Merge: 506a26e d662dff
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Thu Feb 23 08:13:10 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Feb 23 08:13:10 2012 -0500

    Merge topic 'target-include-directories' into next
    
    d662dff Fix shadowed variable warning on dashboard results


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d662dff7690ae4a3b22947f07de4fc952c33e568
commit d662dff7690ae4a3b22947f07de4fc952c33e568
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Thu Feb 23 08:11:09 2012 -0500
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Thu Feb 23 08:11:09 2012 -0500

    Fix shadowed variable warning on dashboard results

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index d206d32..7cd82ba 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -2132,7 +2132,7 @@ void cmMakefile::ExpandVariables()
        l != this->Targets.end(); ++l)
     {
     cmTarget &t = l->second;
-    const char *includeDirs = t.GetProperty("INCLUDE_DIRECTORIES");
+    includeDirs = t.GetProperty("INCLUDE_DIRECTORIES");
     if (includeDirs)
       {
       std::string dirs = includeDirs;

-----------------------------------------------------------------------

Summary of changes:
 Source/cmMakefile.cxx |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake