diff options
| author | Brad King <brad.king@kitware.com> | 2017-09-18 14:06:42 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-09-18 14:06:47 (GMT) |
| commit | ce4f6354096921f7e32d6354d6550ff5724659ab (patch) | |
| tree | e2b0b18fbb23c61eec1bacd971aa07179c0e9d08 /Source/cmExportTryCompileFileGenerator.h | |
| parent | c29e85d009c526fb18296eb9b2c181cdad6e7e3a (diff) | |
| parent | 98530d3c14a5f8002967fe73829fb105b47cc499 (diff) | |
| download | CMake-ce4f6354096921f7e32d6354d6550ff5724659ab.zip CMake-ce4f6354096921f7e32d6354d6550ff5724659ab.tar.gz CMake-ce4f6354096921f7e32d6354d6550ff5724659ab.tar.bz2 | |
Merge topic 'cxx11-override'
98530d3c cm_codecvt: Tell IWYU to keep cmConfigure.h
4e14498f Drop now-unused definition of CM_OVERRIDE
0b33aee4 Use C++11 override instead of CM_OVERRIDE
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1265
Diffstat (limited to 'Source/cmExportTryCompileFileGenerator.h')
| -rw-r--r-- | Source/cmExportTryCompileFileGenerator.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/cmExportTryCompileFileGenerator.h b/Source/cmExportTryCompileFileGenerator.h index 9f6ac03..70c3857 100644 --- a/Source/cmExportTryCompileFileGenerator.h +++ b/Source/cmExportTryCompileFileGenerator.h @@ -27,15 +27,15 @@ public: void SetConfig(const std::string& config) { this->Config = config; } protected: // Implement virtual methods from the superclass. - bool GenerateMainFile(std::ostream& os) CM_OVERRIDE; + bool GenerateMainFile(std::ostream& os) override; void GenerateImportTargetsConfig(std::ostream&, const std::string&, std::string const&, - std::vector<std::string>&) CM_OVERRIDE + std::vector<std::string>&) override { } void HandleMissingTarget(std::string&, std::vector<std::string>&, - cmGeneratorTarget*, cmGeneratorTarget*) CM_OVERRIDE + cmGeneratorTarget*, cmGeneratorTarget*) override { } @@ -44,7 +44,7 @@ protected: std::set<const cmGeneratorTarget*>& emitted); std::string InstallNameDir(cmGeneratorTarget* target, - const std::string& config) CM_OVERRIDE; + const std::string& config) override; private: std::string FindTargets(const std::string& prop, |