diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-05-23 12:52:55 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-05-24 09:09:58 (GMT) |
| commit | aaeec642ca9dfaf301c9a4c38e4b513564c41a5f (patch) | |
| tree | 3a0db56e2a26163547eeab56c28f6a004e744731 | |
| parent | 444bc349781205bbfe3de25c6190beb0a7f0d44c (diff) | |
| download | CMake-aaeec642ca9dfaf301c9a4c38e4b513564c41a5f.zip CMake-aaeec642ca9dfaf301c9a4c38e4b513564c41a5f.tar.gz CMake-aaeec642ca9dfaf301c9a4c38e4b513564c41a5f.tar.bz2 | |
cmGlobalGenerator: De-virtualize methods with no overrides.
| -rw-r--r-- | Source/cmGlobalGenerator.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h index f9ea449..56574b8 100644 --- a/Source/cmGlobalGenerator.h +++ b/Source/cmGlobalGenerator.h @@ -121,7 +121,7 @@ public: * Try running cmake and building a file. This is used for dynamically * loaded commands, not as part of the usual build process. */ - virtual int TryCompile(const std::string& srcdir, const std::string& bindir, + int TryCompile(const std::string& srcdir, const std::string& bindir, const std::string& projectName, const std::string& targetName, bool fast, std::string& output, cmMakefile* mf); @@ -371,7 +371,7 @@ protected: typedef std::vector<cmLocalGenerator*> GeneratorVector; // for a project collect all its targets by following depend // information, and also collect all the targets - virtual void GetTargetSets(TargetDependSet& projectTargets, + void GetTargetSets(TargetDependSet& projectTargets, TargetDependSet& originalTargets, cmLocalGenerator* root, GeneratorVector const&); bool IsRootOnlyTarget(cmTarget* target) const; @@ -446,7 +446,7 @@ protected: TargetMap ImportedTargets; std::vector<cmGeneratorExpressionEvaluationFile*> EvaluationFiles; - virtual const char* GetPredefinedTargetsFolder(); + const char* GetPredefinedTargetsFolder(); virtual bool UseFolderProperty(); private: |