diff options
| author | Brad King <brad.king@kitware.com> | 2015-08-11 12:47:05 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-08-11 12:47:05 (GMT) |
| commit | f33ccc270e29f8df34144a56e14c476b1b48f0af (patch) | |
| tree | 9efe036e6e83a5c1941a94522ccc4416911250c5 /Source/cmGlobalGenerator.h | |
| parent | 489ab9cb3aba79c9f3c1c08d3507b0e19e8ca9c0 (diff) | |
| parent | 1689c91d8d7667426fdca694d801b6189f68d37e (diff) | |
| download | CMake-f33ccc270e29f8df34144a56e14c476b1b48f0af.zip CMake-f33ccc270e29f8df34144a56e14c476b1b48f0af.tar.gz CMake-f33ccc270e29f8df34144a56e14c476b1b48f0af.tar.bz2 | |
Merge topic 'rm-Makefile-LocalGenerator'
1689c91d cmMakefile: Remove unused method.
dd11f72c cmGlobalGenerator: Base exclusion computation on cmGeneratorTarget.
Diffstat (limited to 'Source/cmGlobalGenerator.h')
| -rw-r--r-- | Source/cmGlobalGenerator.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h index ec916ae..c35cba2 100644 --- a/Source/cmGlobalGenerator.h +++ b/Source/cmGlobalGenerator.h @@ -393,7 +393,7 @@ protected: void FillProjectMap(); void CheckLocalGenerators(); bool IsExcluded(cmLocalGenerator* root, cmLocalGenerator* gen) const; - bool IsExcluded(cmLocalGenerator* root, cmTarget const& target) const; + bool IsExcluded(cmLocalGenerator* root, cmGeneratorTarget* target) const; void FillLocalGeneratorToTargetMap(); void CreateDefaultGlobalTargets(cmTargets* targets); cmTarget CreateGlobalTarget(const std::string& name, const char* message, |