[Cmake-commits] CMake branch, next, updated. v2.8.10.1-903-g3e0aa4b

[Alexander Neundorf]

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  3e0aa4b8ca37058c28d7e0556efdf6007bcd2d60 (commit)
       via  3efe1d35f46fedbaaa81777201096808e660d518 (commit)
       via  3359d95c00c221328d284e443c1d49e12630be63 (commit)
      from  220d5ccbb9cf957fd6262981f4b1e03d889ed21f (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=3e0aa4b8ca37058c28d7e0556efdf6007bcd2d60
commit 3e0aa4b8ca37058c28d7e0556efdf6007bcd2d60
Merge: 220d5cc 3efe1d3
Author:     Alexander Neundorf <neundorf at kde.org>
AuthorDate: Sat Nov 17 12:42:47 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Nov 17 12:42:47 2012 -0500

    Merge topic 'AutomocInheritFOLDERTargetProperty' into next
    
    3efe1d3 Automoc: "inherit" FOLDER target property from target (#13688)
    3359d95 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3efe1d35f46fedbaaa81777201096808e660d518
commit 3efe1d35f46fedbaaa81777201096808e660d518
Author:     Alex Neundorf <neundorf at kde.org>
AuthorDate: Sat Nov 17 18:32:54 2012 +0100
Commit:     Alex Neundorf <neundorf at kde.org>
CommitDate: Sat Nov 17 18:32:54 2012 +0100

    Automoc: "inherit" FOLDER target property from target (#13688)
    
    This patch sets the FOLDER target property for the automoc target
    to the same value as of the actual target. This organizes the targets
    in IDEs with folders better.
    
    Inspired-by: Mike Gelfand
    
    Alex

diff --git a/Source/cmQtAutomoc.cxx b/Source/cmQtAutomoc.cxx
index 942c7ab..9423208 100644
--- a/Source/cmQtAutomoc.cxx
+++ b/Source/cmQtAutomoc.cxx
@@ -85,6 +85,18 @@ static std::string extractSubDir(const std::string& absPath,
 }
 
 
+static void copyTargetProperty(cmTarget* destinationTarget,
+                               cmTarget* sourceTarget,
+                               const char* propertyName)
+{
+  const char* propertyValue = sourceTarget->GetProperty(propertyName);
+  if (propertyValue)
+    {
+    destinationTarget->SetProperty(propertyName, propertyValue);
+    }
+}
+
+
 cmQtAutomoc::cmQtAutomoc()
 :Verbose(cmsys::SystemTools::GetEnv("VERBOSE") != 0)
 ,ColorOutput(true)
@@ -152,9 +164,13 @@ void cmQtAutomoc::SetupAutomocTarget(cmTarget* target)
   std::string automocComment = "Automoc for target ";
   automocComment += targetName;
 
-  makefile->AddUtilityCommand(automocTargetName.c_str(), true,
+  cmTarget* automocTarget = makefile->AddUtilityCommand(
+                              automocTargetName.c_str(), true,
                               workingDirectory.c_str(), depends,
                               commandLines, false, automocComment.c_str());
+  // inherit FOLDER property from target (#13688)
+  copyTargetProperty(automocTarget, target, "FOLDER");
+
   target->AddUtility(automocTargetName.c_str());
 
   // configure a file to get all information to automoc at buildtime:

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

Summary of changes:
 Source/CMakeVersion.cmake |    2 +-
 Source/cmQtAutomoc.cxx    |   18 +++++++++++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake