diff options
author | Brad King <brad.king@kitware.com> | 2015-08-31 13:48:28 (GMT) |
---|---|---|
committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-08-31 13:48:28 (GMT) |
commit | 352e8e95b65e19cca10b4aec0c626787dfbb1ba1 (patch) | |
tree | 936261c46c550e734a5b8faab5623c1121b2b9e0 /Source/cmLocalUnixMakefileGenerator3.h | |
parent | 97db5c567894c253173ab45c919925ce010ab05e (diff) | |
parent | 2b9a25d7f723a9876e2979de8e6c06881e0312dc (diff) | |
download | CMake-352e8e95b65e19cca10b4aec0c626787dfbb1ba1.zip CMake-352e8e95b65e19cca10b4aec0c626787dfbb1ba1.tar.gz CMake-352e8e95b65e19cca10b4aec0c626787dfbb1ba1.tar.bz2 |
Merge topic 'generate-time-generators'
2b9a25d7 cmGlobalGenerator: Create global targets directly after Configure.
3e08b4df cmMakefile: Skip Global targets for CMP0019 evaluation.
357bf469 cmGlobalGenerator: Fill the project map at compute time.
ebf8d0a9 cmGlobalGenerator: Rename method.
bd096d30 cmGlobalGenerator: Avoid cmLocalGenerator until after Configure.
ff8ac8ee cmLocalGenerator: Create from already-constructed cmMakefile.
0bd7279f Ninja: Remove some incorrect comments adding no value.
2f2d4da9 cmCTestScriptHandler: Simplify deletes.
7fdc9a8b QtAutogen: Use a smart pointer.
92041eec cmGlobalGenerator: Remove MakeLocalGenerator method.
acb00622 cmGlobalGenerator: Require a snapshot to create a local generator.
83b8a927 cmMakefile: Remove cmLocalGenerator member.
9b6a743b cmLocalGenerator: Remove Parent pointer.
Diffstat (limited to 'Source/cmLocalUnixMakefileGenerator3.h')
-rw-r--r-- | Source/cmLocalUnixMakefileGenerator3.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/Source/cmLocalUnixMakefileGenerator3.h b/Source/cmLocalUnixMakefileGenerator3.h index 01ac01b..98f15e6 100644 --- a/Source/cmLocalUnixMakefileGenerator3.h +++ b/Source/cmLocalUnixMakefileGenerator3.h @@ -34,9 +34,7 @@ class cmSourceFile; class cmLocalUnixMakefileGenerator3 : public cmLocalCommonGenerator { public: - cmLocalUnixMakefileGenerator3(cmGlobalGenerator* gg, - cmLocalGenerator* parent, - cmState::Snapshot snapshot); + cmLocalUnixMakefileGenerator3(cmGlobalGenerator* gg, cmMakefile* mf); virtual ~cmLocalUnixMakefileGenerator3(); virtual void ComputeHomeRelativeOutputPath(); |