summaryrefslogtreecommitdiffstats
path: root/Source/cmGlobalNinjaGenerator.h
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2015-05-24 09:50:55 (GMT)
committerBrad King <brad.king@kitware.com>2015-05-27 13:18:32 (GMT)
commit3b880a07417a0211001b8dfa721ec220e6d8d2e3 (patch)
tree47116544531b097088a6c4d233d6688d035e292e /Source/cmGlobalNinjaGenerator.h
parente12afe766ee9083637ac819ec69a7b4512c39718 (diff)
downloadCMake-3b880a07417a0211001b8dfa721ec220e6d8d2e3.zip
CMake-3b880a07417a0211001b8dfa721ec220e6d8d2e3.tar.gz
CMake-3b880a07417a0211001b8dfa721ec220e6d8d2e3.tar.bz2
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/cmGlobalNinjaGenerator.h')
-rw-r--r--Source/cmGlobalNinjaGenerator.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmGlobalNinjaGenerator.h b/Source/cmGlobalNinjaGenerator.h
index 88b7067..ffd1cdc 100644
--- a/Source/cmGlobalNinjaGenerator.h
+++ b/Source/cmGlobalNinjaGenerator.h
@@ -170,7 +170,8 @@ public:
virtual ~cmGlobalNinjaGenerator() { }
/// Overloaded methods. @see cmGlobalGenerator::CreateLocalGenerator()
- virtual cmLocalGenerator* CreateLocalGenerator(cmLocalGenerator* parent = 0);
+ virtual cmLocalGenerator* CreateLocalGenerator(cmLocalGenerator* parent,
+ cmState::Snapshot snapshot);
/// Overloaded methods. @see cmGlobalGenerator::GetName().
virtual std::string GetName() const {