diff options
| author | Brad King <brad.king@kitware.com> | 2015-05-27 13:22:57 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-05-27 13:22:57 (GMT) |
| commit | 95bab020b3eddde3931b43ca41364ec840e83eae (patch) | |
| tree | 8f47295cdb321ca0efd884258e8e7e3f6c360dc0 /Source/cmGlobalGenerator.h | |
| parent | af570e13fd1fb82652bf8f5eeaa202a584953847 (diff) | |
| parent | f5b0a0fba458077e0531586f07ed2d01fb7f6259 (diff) | |
| download | CMake-95bab020b3eddde3931b43ca41364ec840e83eae.zip CMake-95bab020b3eddde3931b43ca41364ec840e83eae.tar.gz CMake-95bab020b3eddde3931b43ca41364ec840e83eae.tar.bz2 | |
Merge topic 'minor-cleanups'
f5b0a0fb cmMakefile: Don't pop the directory listfile off the stack.
e40fcb59 cmMakefile: Simplify convert condition.
4fdad392 cmake: Remove redundant forward declaration.
df9635f3 cmake: Remove redundant condition.
ad167479 foreach: Remove unused variables.
aaeec642 cmGlobalGenerator: De-virtualize methods with no overrides.
444bc349 Ninja: Remove some bogus comments.
Diffstat (limited to 'Source/cmGlobalGenerator.h')
| -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: |