[Cmake-commits] CMake branch, next, updated. v2.8.12.1-6390-g0d5ae36

[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, next has been updated
       via  0d5ae3696df0b36fc88ce28fcfaabd652bfdcaea (commit)
       via  bd5766423e1a19de0a37aae8c0a07816f4c2d9d6 (commit)
      from  39f50a366013c66abbd7791696a89b416ee8ef5d (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=0d5ae3696df0b36fc88ce28fcfaabd652bfdcaea
commit 0d5ae3696df0b36fc88ce28fcfaabd652bfdcaea
Merge: 39f50a3 bd57664
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Dec 24 09:01:32 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Dec 24 09:01:32 2013 -0500

    Merge topic 'fix-compile-OBJECT_DIR' into next
    
    bd57664 Use cmTarget::GetSupportDirectory for <OBJECT_DIR> replacement

diff --cc Source/cmNinjaTargetGenerator.cxx
index 87a22e8,9c8b481..c8b03e1
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@@ -562,14 -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 =
-     this->LocalGenerator->GetTargetDirectory(*this->Target);
+   std::string objectDir = this->Target->GetSupportDirectory();
    vars["OBJECT_DIR"] = this->GetLocalGenerator()->ConvertToOutputFormat(
                           ConvertToNinjaPath(objectDir.c_str()).c_str(),
                           cmLocalGenerator::SHELL);

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bd5766423e1a19de0a37aae8c0a07816f4c2d9d6
commit bd5766423e1a19de0a37aae8c0a07816f4c2d9d6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Dec 24 08:52:13 2013 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Dec 24 08:52:13 2013 -0500

    Use cmTarget::GetSupportDirectory for <OBJECT_DIR> replacement
    
    It returns a full path which we then convert relative to the proper
    directory separately in the Makefile and Ninja generators.

diff --git a/Source/cmMakefileExecutableTargetGenerator.cxx b/Source/cmMakefileExecutableTargetGenerator.cxx
index 91bf3bd..3a71bd6 100644
--- a/Source/cmMakefileExecutableTargetGenerator.cxx
+++ b/Source/cmMakefileExecutableTargetGenerator.cxx
@@ -338,8 +338,7 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
   vars.CMTarget = this->Target;
   vars.Language = linkLanguage;
   vars.Objects = buildObjs.c_str();
-  std::string objectDir =
-    this->LocalGenerator->GetTargetDirectory(*this->Target);
+  std::string objectDir = this->Target->GetSupportDirectory();
   objectDir = this->Convert(objectDir.c_str(),
                             cmLocalGenerator::START_OUTPUT,
                             cmLocalGenerator::SHELL);
diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx b/Source/cmMakefileLibraryTargetGenerator.cxx
index f767645..ffe68e5 100644
--- a/Source/cmMakefileLibraryTargetGenerator.cxx
+++ b/Source/cmMakefileLibraryTargetGenerator.cxx
@@ -577,8 +577,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
   vars.CMTarget = this->Target;
   vars.Language = linkLanguage;
   vars.Objects = buildObjs.c_str();
-  std::string objectDir =
-    this->LocalGenerator->GetTargetDirectory(*this->Target);
+  std::string objectDir = this->Target->GetSupportDirectory();
   objectDir = this->Convert(objectDir.c_str(),
                             cmLocalGenerator::START_OUTPUT,
                             cmLocalGenerator::SHELL);
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index 83a0ef6..5e6c548 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -638,8 +638,7 @@ cmMakefileTargetGenerator
                   cmLocalGenerator::NONE,
                   cmLocalGenerator::SHELL).c_str();
   vars.Object = shellObj.c_str();
-  std::string objectDir =
-    this->LocalGenerator->GetTargetDirectory(*this->Target);
+  std::string objectDir = this->Target->GetSupportDirectory();
   objectDir = this->Convert(objectDir.c_str(),
                             cmLocalGenerator::START_OUTPUT,
                             cmLocalGenerator::SHELL);
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index 40fe67d..9c8b481 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -543,8 +543,7 @@ cmNinjaTargetGenerator
   vars["DEP_FILE"] = objectFileName + ".d";;
   EnsureParentDirectoryExists(objectFileName);
 
-  std::string objectDir =
-    this->LocalGenerator->GetTargetDirectory(*this->Target);
+  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 |    3 +--
 Source/cmMakefileLibraryTargetGenerator.cxx    |    3 +--
 Source/cmMakefileTargetGenerator.cxx           |    3 +--
 Source/cmNinjaTargetGenerator.cxx              |    3 +--
 4 files changed, 4 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
CMake