diff options
| author | Brad King <brad.king@kitware.com> | 2015-08-27 14:04:12 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-08-27 14:04:12 (GMT) |
| commit | 445077cbd2343050250eb0d541633010db659312 (patch) | |
| tree | 6da95566f41ffb53d80294021d332781cb863ec3 /Source/cmComputeLinkDepends.cxx | |
| parent | 0d0b9b52f8a538a6327e2e9f848b943474afc682 (diff) | |
| parent | 7f551b4f2635816553c2ff7dacef78254875116e (diff) | |
| download | CMake-445077cbd2343050250eb0d541633010db659312.zip CMake-445077cbd2343050250eb0d541633010db659312.tar.gz CMake-445077cbd2343050250eb0d541633010db659312.tar.bz2 | |
Merge topic 'minor-cleanups'
7f551b4f cmGlobalGenerator: Implement VS6 check without virtual method.
cd6293cd cmMakefile: Fix style.
de6b2895 cmTarget: Remove vestigal method declaration.
e35ee02d cmTarget: Fix indentation.
00f2298f Reduce uses of cmMakefile::GetGlobalGenerator.
6254ba95 cmMakefile: Remove Internal class.
cf0a78dc cmGeneratorTarget: Issue messages through the local generator.
Diffstat (limited to 'Source/cmComputeLinkDepends.cxx')
| -rw-r--r-- | Source/cmComputeLinkDepends.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Source/cmComputeLinkDepends.cxx b/Source/cmComputeLinkDepends.cxx index 59590fd..1e02ae4 100644 --- a/Source/cmComputeLinkDepends.cxx +++ b/Source/cmComputeLinkDepends.cxx @@ -12,6 +12,7 @@ #include "cmComputeLinkDepends.h" #include "cmComputeComponentGraph.h" +#include "cmLocalGenerator.h" #include "cmGlobalGenerator.h" #include "cmMakefile.h" #include "cmTarget.h" @@ -177,7 +178,8 @@ cmComputeLinkDepends // Store context information. this->Target = target; this->Makefile = this->Target->Target->GetMakefile(); - this->GlobalGenerator = this->Makefile->GetGlobalGenerator(); + this->GlobalGenerator = + this->Target->GetLocalGenerator()->GetGlobalGenerator(); this->CMakeInstance = this->GlobalGenerator->GetCMakeInstance(); // The configuration being linked. |