[Cmake-commits] CMake branch, next, updated. v2.8.6-2202-g65f7aad

[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  65f7aad2f7d8884a21b9e99dc58baa16d1aef36a (commit)
       via  7ab1162eaa1490be745f2b2a24ba7b4a3ec69112 (commit)
      from  4d9a5b6c65247f948167ef7a22bf133ea7ff0f37 (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=65f7aad2f7d8884a21b9e99dc58baa16d1aef36a
commit 65f7aad2f7d8884a21b9e99dc58baa16d1aef36a
Merge: 4d9a5b6 7ab1162
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Tue Dec 13 20:33:21 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Dec 13 20:33:21 2011 -0500

    Merge topic 'fix-12441-show-custom-target-progress' into next
    
    7ab1162 CMake: Fix progress reporting for custom targets (#12441)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7ab1162eaa1490be745f2b2a24ba7b4a3ec69112
commit 7ab1162eaa1490be745f2b2a24ba7b4a3ec69112
Author:     Johan Fänge <vastevaste at gmail.com>
AuthorDate: Tue Sep 13 17:24:55 2011 +0800
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Tue Dec 13 20:06:27 2011 -0500

    CMake: Fix progress reporting for custom targets (#12441)
    
    Adds "include progress.make" to build.make, just like for
    add_executable and add_library targets. The code was copied
    from cmMakefileTargetGenerator::WriteCommonCodeRules().

diff --git a/Source/cmMakefileUtilityTargetGenerator.cxx b/Source/cmMakefileUtilityTargetGenerator.cxx
index f52f7ab..a82c503 100644
--- a/Source/cmMakefileUtilityTargetGenerator.cxx
+++ b/Source/cmMakefileUtilityTargetGenerator.cxx
@@ -34,6 +34,20 @@ void cmMakefileUtilityTargetGenerator::WriteRuleFiles()
   *this->BuildFileStream
     << "# Utility rule file for " << this->Target->GetName() << ".\n\n";
 
+  if(!this->NoRuleMessages)
+    {
+    const char* root = (this->Makefile->IsOn("CMAKE_MAKE_INCLUDE_FROM_ROOT")?
+                      "$(CMAKE_BINARY_DIR)/" : "");
+    // Include the progress variables for the target.
+    *this->BuildFileStream
+      << "# Include the progress variables for this target.\n"
+      << this->LocalGenerator->IncludeDirective << " " << root
+      << this->Convert(this->ProgressFileNameFull.c_str(),
+                       cmLocalGenerator::HOME_OUTPUT,
+                       cmLocalGenerator::MAKEFILE)
+      << "\n\n";
+    }
+
   // write the custom commands for this target
   this->WriteTargetBuildRules();
 

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

Summary of changes:
 Source/cmMakefileUtilityTargetGenerator.cxx |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake