diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-05-24 11:50:55 +0200 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-05-27 09:18:32 -0400 |
| commit | 3b880a07417a0211001b8dfa721ec220e6d8d2e3 (patch) | |
| tree | 47116544531b097088a6c4d233d6688d035e292e /Source/cmGlobalBorlandMakefileGenerator.cxx | |
| parent | e12afe766ee9083637ac819ec69a7b4512c39718 (diff) | |
| download | cmake-3b880a07417a0211001b8dfa721ec220e6d8d2e3.tar.gz | |
cmLocalGenerator: Require a valid cmState::Snapshot in the ctor.
Refactor the local generator creation API to accept a
cmState::Snapshot. Adjust MakeLocalGenerator to use the 'current'
snapshot in cases where there is no parent. Create the snapshot
for subdirectories in cmMakefile::AddSubdirectory.
This means that snapshots are now created at the point of extending the tree,
as appropriate, and independently of the cmLocalGenerator and cmMakefile they
represent the state for.
Diffstat (limited to 'Source/cmGlobalBorlandMakefileGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalBorlandMakefileGenerator.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmGlobalBorlandMakefileGenerator.cxx b/Source/cmGlobalBorlandMakefileGenerator.cxx index 7d05726775..87665a03b3 100644 --- a/Source/cmGlobalBorlandMakefileGenerator.cxx +++ b/Source/cmGlobalBorlandMakefileGenerator.cxx @@ -44,10 +44,10 @@ void cmGlobalBorlandMakefileGenerator ///! Create a local generator appropriate to this Global Generator cmLocalGenerator *cmGlobalBorlandMakefileGenerator::CreateLocalGenerator( - cmLocalGenerator* parent) + cmLocalGenerator* parent, cmState::Snapshot snapshot) { cmLocalUnixMakefileGenerator3* lg = - new cmLocalUnixMakefileGenerator3(this, parent); + new cmLocalUnixMakefileGenerator3(this, parent, snapshot); lg->SetMakefileVariableSize(32); lg->SetMakeCommandEscapeTargetTwice(true); lg->SetBorlandMakeCurlyHack(true); |