[Cmake-commits] CMake branch, next, updated. v2.8.2-967-ge15e070

[Bill Hoffman]

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  e15e070ac602ee860aea5f0f382e2c5373ab6471 (commit)
       via  3d68dd230d84a1faac9b4d6750ec36cba3c6f8a2 (commit)
      from  d9dc4dbe4359c4da0cda11c479faa5a1a0386401 (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=e15e070ac602ee860aea5f0f382e2c5373ab6471
commit e15e070ac602ee860aea5f0f382e2c5373ab6471
Merge: d9dc4db 3d68dd2
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Wed Sep 29 17:04:11 2010 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Sep 29 17:04:11 2010 -0400

    Merge topic 'fix_custom_commands_with_intdir_vs10' into next
    
    3d68dd2 Fix for bug #11274, VS10 custom commands that create files in INTDIR fix.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3d68dd230d84a1faac9b4d6750ec36cba3c6f8a2
commit 3d68dd230d84a1faac9b4d6750ec36cba3c6f8a2
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Wed Sep 29 17:02:04 2010 -0400
Commit:     Bill Hoffman <bill.hoffman at kitware.com>
CommitDate: Wed Sep 29 17:02:04 2010 -0400

    Fix for bug #11274, VS10 custom commands that create files in INTDIR fix.

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index c64053a..ef15113 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -894,6 +894,14 @@ cmMakefile::AddCustomCommandToOutput(const std::vector<std::string>& outputs,
     // Construct a rule file associated with the first output produced.
     std::string outName = outputs[0];
     outName += ".rule";
+    const char* dir =
+      this->LocalGenerator->GetGlobalGenerator()->
+      GetCMakeCFGInitDirectory();
+    if(dir && dir[0] == '$')
+      {
+      cmSystemTools::ReplaceString(outName, dir,
+                                   cmake::GetCMakeFilesDirectory());
+      }
     // Check if the rule file already exists.
     file = this->GetSource(outName.c_str());
     if(file && file->GetCustomCommand() && !replace)

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

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


hooks/post-receive
-- 
CMake