diff options
author | Stephen Kelly <steveire@gmail.com> | 2015-05-24 09:50:55 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2015-05-27 13:18:32 (GMT) |
commit | 3b880a07417a0211001b8dfa721ec220e6d8d2e3 (patch) | |
tree | 47116544531b097088a6c4d233d6688d035e292e /Source/cmGlobalGhsMultiGenerator.h | |
parent | e12afe766ee9083637ac819ec69a7b4512c39718 (diff) | |
download | CMake-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/cmGlobalGhsMultiGenerator.h')
-rw-r--r-- | Source/cmGlobalGhsMultiGenerator.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmGlobalGhsMultiGenerator.h b/Source/cmGlobalGhsMultiGenerator.h index 8b7ecf8..f1a3ed7 100644 --- a/Source/cmGlobalGhsMultiGenerator.h +++ b/Source/cmGlobalGhsMultiGenerator.h @@ -31,7 +31,8 @@ public: { return new cmGlobalGeneratorSimpleFactory<cmGlobalGhsMultiGenerator>(); } ///! create the correct local generator - virtual cmLocalGenerator *CreateLocalGenerator(cmLocalGenerator* parent = 0); + virtual cmLocalGenerator *CreateLocalGenerator(cmLocalGenerator* parent, + cmState::Snapshot snapshot); /// @return the name of this generator. static std::string GetActualName() { return "Green Hills MULTI"; } |