[Cmake-commits] CMake branch, master, updated. v2.8.12.1-1031-g7a63192

[Brad King]

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, master has been updated
       via  7a63192074513a52283c2ae6f673bdab1bbcb3ad (commit)
       via  03f3b4e727d7d5f6c3ba4f0a64a2f440cff43a7d (commit)
      from  fef56edee777b69716bd288d453c1263c0a291ef (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=7a63192074513a52283c2ae6f673bdab1bbcb3ad
commit 7a63192074513a52283c2ae6f673bdab1bbcb3ad
Merge: fef56ed 03f3b4e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 2 14:23:52 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 2 14:23:52 2014 -0500

    Merge topic 'fix-compile-OBJECT_DIR'
    
    03f3b4e Replace <OBJECT_DIR> rule placeholder consistently (#14667)

diff --cc Source/cmNinjaTargetGenerator.cxx
index e3c058f,9c8b481..c8b03e1
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@@ -562,13 -540,10 +562,13 @@@ cmNinjaTargetGenerato
    cmNinjaVars vars;
    vars["FLAGS"] = this->ComputeFlagsForObject(source, language);
    vars["DEFINES"] = this->ComputeDefines(source, language);
 -  vars["DEP_FILE"] = objectFileName + ".d";;
 +  if (needsDepFile(language)) {
 +    vars["DEP_FILE"] =
 +            cmGlobalNinjaGenerator::EncodeDepfileSpace(objectFileName + ".d");
 +  }
    EnsureParentDirectoryExists(objectFileName);
  
-   std::string objectDir = cmSystemTools::GetFilenamePath(objectFileName);
+   std::string objectDir = this->Target->GetSupportDirectory();
    vars["OBJECT_DIR"] = this->GetLocalGenerator()->ConvertToOutputFormat(
                           ConvertToNinjaPath(objectDir.c_str()).c_str(),
                           cmLocalGenerator::SHELL);

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

Summary of changes:
 Source/cmMakefileExecutableTargetGenerator.cxx |   12 +++++-------
 Source/cmMakefileLibraryTargetGenerator.cxx    |   12 +++++-------
 Source/cmMakefileTargetGenerator.cxx           |    2 +-
 Source/cmNinjaTargetGenerator.cxx              |    2 +-
 4 files changed, 12 insertions(+), 16 deletions(-)


hooks/post-receive
-- 
CMake