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 fae02d5e5126fba375e26ec66f216a1d16f29413 (commit)
via 866e4d53ea3a1084e8ba1dd672af83ff3d62c697 (commit)
from 74adf4e543d506a44500d0aa9bf1203c2270b217 (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=fae02d5e5126fba375e26ec66f216a1d16f29413
commit fae02d5e5126fba375e26ec66f216a1d16f29413
Merge: 74adf4e 866e4d5
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Tue Oct 4 17:10:02 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Oct 4 17:10:02 2016 -0400
Merge topic 'extract-cmLinkLineComputer' into next
866e4d53 fixup! cmLinkLineComputer: Extract from cmLocalGenerator
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=866e4d53ea3a1084e8ba1dd672af83ff3d62c697
commit 866e4d53ea3a1084e8ba1dd672af83ff3d62c697
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Tue Oct 4 23:08:51 2016 +0200
Commit: Stephen Kelly <steve...@gmail.com>
CommitDate: Tue Oct 4 23:09:30 2016 +0200
fixup! cmLinkLineComputer: Extract from cmLocalGenerator
diff --git a/Source/cmMakefileExecutableTargetGenerator.cxx
b/Source/cmMakefileExecutableTargetGenerator.cxx
index 8bc7ddf..9ee3933 100644
--- a/Source/cmMakefileExecutableTargetGenerator.cxx
+++ b/Source/cmMakefileExecutableTargetGenerator.cxx
@@ -212,16 +212,9 @@ void
cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
linkFlags, this->GeneratorTarget->GetProperty(linkFlagsConfig));
{
- CM_AUTO_PTR<cmLinkLineComputer> linkLineComputer;
-
- if (this->Makefile->IsOn("MSVC60")) {
- linkLineComputer.reset(
- this->GlobalGenerator->CreateMSVC60LinkLineComputer(
- this->LocalGenerator->GetStateSnapshot().GetDirectory()));
- } else {
- linkLineComputer.reset(this->GlobalGenerator->CreateLinkLineComputer(
+ CM_AUTO_PTR<cmLinkLineComputer> linkLineComputer(
+ this->CreateLinkLineComputer(
this->LocalGenerator->GetStateSnapshot().GetDirectory()));
- }
this->AddModuleDefinitionFlag(linkLineComputer.get(), linkFlags);
}
diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx
b/Source/cmMakefileLibraryTargetGenerator.cxx
index f6f4a00..b12e779 100644
--- a/Source/cmMakefileLibraryTargetGenerator.cxx
+++ b/Source/cmMakefileLibraryTargetGenerator.cxx
@@ -8,7 +8,6 @@
#include "cmLinkLineComputer.h"
#include "cmLocalGenerator.h"
#include "cmLocalUnixMakefileGenerator3.h"
-#include "cmMSVC60LinkLineComputer.h"
#include "cmMakefile.h"
#include "cmOSXBundleGenerator.h"
#include "cmOutputConverter.h"
@@ -162,15 +161,9 @@ void
cmMakefileLibraryTargetGenerator::WriteSharedLibraryRules(bool relink)
this->LocalGenerator->AddConfigVariableFlags(
extraFlags, "CMAKE_SHARED_LINKER_FLAGS", this->ConfigName);
- CM_AUTO_PTR<cmLinkLineComputer> linkLineComputer;
-
- if (this->Makefile->IsOn("MSVC60")) {
- linkLineComputer.reset(this->GlobalGenerator->CreateMSVC60LinkLineComputer(
- this->LocalGenerator->GetStateSnapshot().GetDirectory()));
- } else {
- linkLineComputer.reset(this->GlobalGenerator->CreateLinkLineComputer(
+ CM_AUTO_PTR<cmLinkLineComputer> linkLineComputer(
+ this->CreateLinkLineComputer(
this->LocalGenerator->GetStateSnapshot().GetDirectory()));
- }
this->AddModuleDefinitionFlag(linkLineComputer.get(), extraFlags);
@@ -198,15 +191,9 @@ void
cmMakefileLibraryTargetGenerator::WriteModuleLibraryRules(bool relink)
this->LocalGenerator->AddConfigVariableFlags(
extraFlags, "CMAKE_MODULE_LINKER_FLAGS", this->ConfigName);
- CM_AUTO_PTR<cmLinkLineComputer> linkLineComputer;
-
- if (this->Makefile->IsOn("MSVC60")) {
- linkLineComputer.reset(this->GlobalGenerator->CreateMSVC60LinkLineComputer(
- this->LocalGenerator->GetStateSnapshot().GetDirectory()));
- } else {
- linkLineComputer.reset(this->GlobalGenerator->CreateLinkLineComputer(
+ CM_AUTO_PTR<cmLinkLineComputer> linkLineComputer(
+ this->CreateLinkLineComputer(
this->LocalGenerator->GetStateSnapshot().GetDirectory()));
- }
this->AddModuleDefinitionFlag(linkLineComputer.get(), extraFlags);
diff --git a/Source/cmMakefileTargetGenerator.cxx
b/Source/cmMakefileTargetGenerator.cxx
index d6c496f..95f883e 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -1580,6 +1580,15 @@ std::string
cmMakefileTargetGenerator::CreateResponseFile(
return responseFileName;
}
+cmLinkLineComputer* cmMakefileTargetGenerator::CreateLinkLineComputer(
+ cmState::Directory stateDir)
+{
+ if (this->Makefile->IsOn("MSVC60")) {
+ return this->GlobalGenerator->CreateMSVC60LinkLineComputer(stateDir);
+ }
+ return this->GlobalGenerator->CreateLinkLineComputer(stateDir);
+}
+
void cmMakefileTargetGenerator::CreateLinkLibs(
std::string& linkLibs, bool relink, bool useResponseFile,
std::vector<std::string>& makefile_depends, bool useWatcomQuote)
@@ -1587,15 +1596,9 @@ void cmMakefileTargetGenerator::CreateLinkLibs(
std::string frameworkPath;
std::string linkPath;
- CM_AUTO_PTR<cmLinkLineComputer> linkLineComputer;
-
- if (this->Makefile->IsOn("MSVC60")) {
- linkLineComputer.reset(this->GlobalGenerator->CreateMSVC60LinkLineComputer(
+ CM_AUTO_PTR<cmLinkLineComputer> linkLineComputer(
+ this->CreateLinkLineComputer(
this->LocalGenerator->GetStateSnapshot().GetDirectory()));
- } else {
- linkLineComputer.reset(this->GlobalGenerator->CreateLinkLineComputer(
- this->LocalGenerator->GetStateSnapshot().GetDirectory()));
- }
this->LocalGenerator->OutputLinkLibraries(
linkLineComputer.get(), linkLibs, frameworkPath, linkPath,
diff --git a/Source/cmMakefileTargetGenerator.h
b/Source/cmMakefileTargetGenerator.h
index df7b6aa..6d367bd 100644
--- a/Source/cmMakefileTargetGenerator.h
+++ b/Source/cmMakefileTargetGenerator.h
@@ -140,6 +140,8 @@ protected:
std::vector<std::string>& makefile_commands,
std::vector<std::string>& makefile_depends);
+ cmLinkLineComputer* CreateLinkLineComputer(cmState::Directory stateDir);
+
/** Create a response file with the given set of options. Returns
the relative path from the target build working directory to the
response file name. */
-----------------------------------------------------------------------
Summary of changes:
Source/cmMakefileExecutableTargetGenerator.cxx | 11 ++---------
Source/cmMakefileLibraryTargetGenerator.cxx | 21 ++++-----------------
Source/cmMakefileTargetGenerator.cxx | 19 +++++++++++--------
Source/cmMakefileTargetGenerator.h | 2 ++
4 files changed, 19 insertions(+), 34 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
