[Cmake-commits] CMake branch, next, updated. v2.8.9-633-gb7e6a53

[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  b7e6a530fc601fb742f94bc8793e5d2e9c4f6289 (commit)
       via  e83cc94dcd250e90143450bc916353b449043081 (commit)
       via  9d8e59db71833dce7133bac48e461e388223eb51 (commit)
      from  356a747a8eb66740b92eda940f97b8b9847e148e (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=b7e6a530fc601fb742f94bc8793e5d2e9c4f6289
commit b7e6a530fc601fb742f94bc8793e5d2e9c4f6289
Merge: 356a747 e83cc94
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Sep 19 12:46:36 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Sep 19 12:46:36 2012 -0400

    Merge topic 'AutomocUseTargetProperties' into next
    
    e83cc94 Use the cmGeneratorTarget for the include directories API.
    9d8e59d Merge branch 'use-generator-target' into AutomocUseTargetProperties


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e83cc94dcd250e90143450bc916353b449043081
commit e83cc94dcd250e90143450bc916353b449043081
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Sep 19 18:45:01 2012 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Sep 19 18:45:01 2012 +0200

    Use the cmGeneratorTarget for the include directories API.
    
    Also, no need to get the include directories from the target
    beforehand. The local generator does that for us anyway.

diff --git a/Source/cmQtAutomoc.cxx b/Source/cmQtAutomoc.cxx
index 386a3bf..68f1046 100644
--- a/Source/cmQtAutomoc.cxx
+++ b/Source/cmQtAutomoc.cxx
@@ -194,8 +194,9 @@ void cmQtAutomoc::SetupAutomocTarget(cmTarget* target)
       }
     }
 
-  std::vector<std::string> includeDirs = target->GetIncludeDirectories();
-  localGen->GetIncludeDirectories(includeDirs, target, "CXX");
+  std::vector<std::string> includeDirs;
+  cmGeneratorTarget gtgt(target);
+  localGen->GetIncludeDirectories(includeDirs, &gtgt, "CXX");
   std::string _moc_incs = "";
   const char* sep = "";
   for(std::vector<std::string>::const_iterator incDirIt = includeDirs.begin();

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9d8e59db71833dce7133bac48e461e388223eb51
commit 9d8e59db71833dce7133bac48e461e388223eb51
Merge: ea12871 6674583
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Sep 19 18:33:11 2012 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Sep 19 18:33:11 2012 +0200

    Merge branch 'use-generator-target' into AutomocUseTargetProperties


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

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


hooks/post-receive
-- 
CMake