diff options
| author | Brad King <brad.king@kitware.com> | 2015-09-28 14:44:59 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-09-28 14:44:59 (GMT) |
| commit | 6c6a8c5d5a648b5847042f55fd36ba9a51b0166a (patch) | |
| tree | 660b46700739675fc2051def8eacab830801f73b /Source/cmGlobalGenerator.h | |
| parent | 5b4652842784fc7da2f4b9a04569bad4bda04a84 (diff) | |
| parent | 51e4863782f45c0cb8b89c4ae1ddf0a40e366d40 (diff) | |
| download | CMake-6c6a8c5d5a648b5847042f55fd36ba9a51b0166a.zip CMake-6c6a8c5d5a648b5847042f55fd36ba9a51b0166a.tar.gz CMake-6c6a8c5d5a648b5847042f55fd36ba9a51b0166a.tar.bz2 | |
Merge topic 'minor-cleanups'
51e48637 VS: Remove impossible condition.
203eada6 cmMakefile: Remove Configured state.
5642449a cmCommand: Remove IsDiscouraged interface.
77c6a339 cmSetCommand: Re-use local named variable.
732f5511 cmSetCommand: Fix typo in comment.
8544f16d cmGlobalGenerator: Devirtualize method.
9096daaf Ninja: Remove unused variable.
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 83cbc3f..ba7bae3 100644 --- a/Source/cmGlobalGenerator.h +++ b/Source/cmGlobalGenerator.h @@ -124,7 +124,7 @@ public: /** * Try to determine system information, get it from another generator */ - virtual void EnableLanguagesFromGenerator(cmGlobalGenerator *gen, + void EnableLanguagesFromGenerator(cmGlobalGenerator *gen, cmMakefile* mf); /** |