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 bd87ae1dcc2f2c01ea806268185b075f0bc97c9e (commit)
via a103f41a1a63912bb82f18d36a0bc5a849971b2f (commit)
from 09854f3ce8bcfb401eb27390c881d92a2a85a1da (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bd87ae1dcc2f2c01ea806268185b075f0bc97c9e
commit bd87ae1dcc2f2c01ea806268185b075f0bc97c9e
Merge: 09854f3 a103f41
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Wed Oct 7 14:40:28 2015 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Wed Oct 7 14:40:28 2015 -0400
Merge topic 'add-cmLocalGenerator-API' into next
a103f41a fixup! cmLocalGenerator: Add Home directory accessors.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a103f41a1a63912bb82f18d36a0bc5a849971b2f
commit a103f41a1a63912bb82f18d36a0bc5a849971b2f
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Wed Oct 7 20:40:09 2015 +0200
Commit: Stephen Kelly <steve...@gmail.com>
CommitDate: Wed Oct 7 20:40:09 2015 +0200
fixup! cmLocalGenerator: Add Home directory accessors.
diff --git a/Source/cmGhsMultiTargetGenerator.cxx
b/Source/cmGhsMultiTargetGenerator.cxx
index a913e19..4a362d8 100644
--- a/Source/cmGhsMultiTargetGenerator.cxx
+++ b/Source/cmGhsMultiTargetGenerator.cxx
@@ -70,7 +70,7 @@ cmGhsMultiTargetGenerator::GetAbsPathToRoot(const cmTarget
*target)
{
cmGeneratorTarget* gt = target->GetMakefile()->GetGlobalGenerator()
->GetGeneratorTarget(target);
- return gt->GetLocalGenerator()->GetHomeOutputDirectory();
+ return gt->GetLocalGenerator()->GetBinaryDirectory();
}
std::string
@@ -451,7 +451,7 @@ void cmGhsMultiTargetGenerator::WriteSources(
cmSystemTools::ConvertToUnixSlashes(sgPath);
cmGlobalGhsMultiGenerator::AddFilesUpToPath(
this->GetFolderBuildStreams(), &this->FolderBuildStreams,
- this->LocalGenerator->GetHomeOutputDirectory(), sgPath,
+ this->LocalGenerator->GetBinaryDirectory(), sgPath,
GhsMultiGpj::SUBPROJECT, this->RelBuildFilePath);
std::string fullSourcePath((*si)->GetFullPath());
diff --git a/Source/cmGlobalVisualStudio8Generator.cxx
b/Source/cmGlobalVisualStudio8Generator.cxx
index 41021a1..0a6844e 100644
--- a/Source/cmGlobalVisualStudio8Generator.cxx
+++ b/Source/cmGlobalVisualStudio8Generator.cxx
@@ -315,7 +315,7 @@ bool cmGlobalVisualStudio8Generator::AddCheckTarget()
argH += lg->GetSourceDirectory();
commandLine.push_back(argH);
std::string argB = "-B";
- argB += lg->GetHomeOutputDirectory();
+ argB += lg->GetBinaryDirectory();
commandLine.push_back(argB);
commandLine.push_back("--check-stamp-list");
commandLine.push_back(stampList.c_str());
diff --git a/Source/cmLocalVisualStudio6Generator.cxx
b/Source/cmLocalVisualStudio6Generator.cxx
index 84d5ea4..b84cbc5 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -229,7 +229,7 @@ void
cmLocalVisualStudio6Generator::AddDSPBuildRule(cmTarget& tgt)
args += this->GetSourceDirectory();
commandLine.push_back(args);
args = "-B";
- args += this->GetHomeOutputDirectory();
+ args += this->GetBinaryDirectory();
commandLine.push_back(args);
std::vector<std::string> const& listFiles = this->Makefile->GetListFiles();
diff --git a/Source/cmLocalVisualStudio7Generator.cxx
b/Source/cmLocalVisualStudio7Generator.cxx
index 000b843..90c17c6 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -293,7 +293,7 @@ cmSourceFile*
cmLocalVisualStudio7Generator::CreateVCProjBuildRule()
args += this->GetSourceDirectory();
commandLine.push_back(args);
args = "-B";
- args += this->GetHomeOutputDirectory();
+ args += this->GetBinaryDirectory();
commandLine.push_back(args);
commandLine.push_back("--check-stamp-file");
std::string stampFilename = this->Convert(stampName.c_str(), FULL,
-----------------------------------------------------------------------
Summary of changes:
Source/cmGhsMultiTargetGenerator.cxx | 4 ++--
Source/cmGlobalVisualStudio8Generator.cxx | 2 +-
Source/cmLocalVisualStudio6Generator.cxx | 2 +-
Source/cmLocalVisualStudio7Generator.cxx | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
