summaryrefslogtreecommitdiffstats
path: root/Source/cmMakefileTargetGenerator.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2006-12-14 19:30:41 (GMT)
committerBrad King <brad.king@kitware.com>2006-12-14 19:30:41 (GMT)
commitf7611f167cef7d5d517e901984f5f6c72aa61cf9 (patch)
tree49feb363a4022eaa70bffc59f01a5a7562c4e1ba /Source/cmMakefileTargetGenerator.cxx
parent1fe21ae35ec49db320955a6d9c1cbf4807e2f9f3 (diff)
downloadCMake-f7611f167cef7d5d517e901984f5f6c72aa61cf9.zip
CMake-f7611f167cef7d5d517e901984f5f6c72aa61cf9.tar.gz
CMake-f7611f167cef7d5d517e901984f5f6c72aa61cf9.tar.bz2
ENH: Made cmMakefileTargetGenerator::GlobalGenerator have full type cmGlobalUnixMakefileGenerator3 to give access to all methods. Fixed broken custom targets with no commands for Borland makefiles when CMAKE_SKIP_RULE_DEPENDENCY is set.
Diffstat (limited to 'Source/cmMakefileTargetGenerator.cxx')
-rw-r--r--Source/cmMakefileTargetGenerator.cxx10
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index 1adff5c..e941f58 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -65,7 +65,8 @@ cmMakefileTargetGenerator::New(cmLocalUnixMakefileGenerator3 *lg,
result->TargetName = tgtName;
result->Target = tgt;
result->LocalGenerator = lg;
- result->GlobalGenerator = lg->GetGlobalGenerator();
+ result->GlobalGenerator =
+ static_cast<cmGlobalUnixMakefileGenerator3*>(lg->GetGlobalGenerator());
result->Makefile = lg->GetMakefile();
return result;
}
@@ -891,9 +892,7 @@ void cmMakefileTargetGenerator
depends.clear();
depends.push_back(*o);
commands.clear();
- cmGlobalUnixMakefileGenerator3* gg =
- static_cast<cmGlobalUnixMakefileGenerator3*>(this->GlobalGenerator);
- std::string emptyCommand = gg->GetEmptyCommandHack();
+ std::string emptyCommand = this->GlobalGenerator->GetEmptyCommandHack();
if(!emptyCommand.empty())
{
commands.push_back(emptyCommand);
@@ -911,7 +910,8 @@ void cmMakefileTargetGenerator
this->LocalGenerator->WriteMakeRule(*this->BuildFileStream, 0,
o->c_str(), depends, commands,
symbolic);
- gg->AddMultipleOutputPair(o->c_str(), depends[0].c_str());
+ this->GlobalGenerator->AddMultipleOutputPair(o->c_str(),
+ depends[0].c_str());
}
}