mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-11 16:32:14 -06:00
Code Issues Packages Projects Releases Wiki Activity

Add missing override

Browse Source
This commit is contained in:
Vitaly Stakhovsky
2018-12-30 12:32:55 -05:00
parent ae8525b82f
commit 94632087b2
10 changed files with 34 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Source/CPack/WiX/cmCPackWIXGenerator.h
View File

@@ -28,20 +28,20 @@ public:
~cmCPackWIXGenerator();
protected:
virtual int InitializeInternal();
int InitializeInternal() override;
virtual int PackageFiles();
int PackageFiles() override;
virtual const char* GetOutputExtension() { return ".msi"; }
const char* GetOutputExtension() override { return ".msi"; }
virtual enum CPackSetDestdirSupport SupportsSetDestdir() const
enum CPackSetDestdirSupport SupportsSetDestdir() const override
{
return SETDESTDIR_UNSUPPORTED;
}
virtual bool SupportsAbsoluteDestination() const { return false; }
bool SupportsAbsoluteDestination() const override { return false; }
virtual bool SupportsComponentInstallation() const { return true; }
bool SupportsComponentInstallation() const override { return true; }
private:
typedef std::map<std::string, std::string> id_map_t;

29
Source/cmGlobalGhsMultiGenerator.h
View File

@@ -25,13 +25,13 @@ public:
}
///! create the correct local generator
virtual cmLocalGenerator* CreateLocalGenerator(cmMakefile* mf);
cmLocalGenerator* CreateLocalGenerator(cmMakefile* mf) override;
/// @return the name of this generator.
static std::string GetActualName() { return "Green Hills MULTI"; }
///! Get the name for this generator
virtual std::string GetName() const { return this->GetActualName(); }
std::string GetName() const override { return this->GetActualName(); }
/// Overloaded methods. @see cmGlobalGenerator::GetDocumentation()
static void GetDocumentation(cmDocumentationEntry& entry);
@@ -49,15 +49,15 @@ public:
static bool SupportsPlatform() { return true; }
// Toolset / Platform Support
virtual bool SetGeneratorToolset(std::string const& ts, cmMakefile* mf);
virtual bool SetGeneratorPlatform(std::string const& p, cmMakefile* mf);
bool SetGeneratorToolset(std::string const& ts, cmMakefile* mf) override;
bool SetGeneratorPlatform(std::string const& p, cmMakefile* mf) override;
/**
* Try to determine system information such as shared library
* extension, pthreads, byte order etc.
*/
virtual void EnableLanguage(std::vector<std::string> const& languages,
cmMakefile*, bool optional);
void EnableLanguage(std::vector<std::string> const& languages, cmMakefile*,
bool optional) override;
/*
* Determine what program to use for building the project.
*/
@@ -88,13 +88,16 @@ public:
inline bool IsOSDirRelative() { return this->OSDirRelative; }
protected:
virtual void Generate();
virtual void GenerateBuildCommand(
std::vector<std::string>& makeCommand, const std::string& makeProgram,
const std::string& projectName, const std::string& projectDir,
const std::string& targetName, const std::string& config, bool fast,
int jobs, bool verbose,
std::vector<std::string> const& makeOptions = std::vector<std::string>());
void Generate() override;
void GenerateBuildCommand(std::vector<std::string>& makeCommand,
const std::string& makeProgram,
const std::string& projectName,
const std::string& projectDir,
const std::string& targetName,
const std::string& config, bool fast, int jobs,
bool verbose,
std::vector<std::string> const& makeOptions =
std::vector<std::string>()) override;
private:
void GetToolset(cmMakefile* mf, std::string& tsd, std::string& ts);

2
Source/cmGlobalVisualStudio10Generator.h
View File

@@ -86,7 +86,7 @@ public:
}
/** Return true if building for WindowsCE */
bool TargetsWindowsCE() const { return this->SystemIsWindowsCE; }
bool TargetsWindowsCE() const override { return this->SystemIsWindowsCE; }
/** Return true if building for WindowsPhone */
bool TargetsWindowsPhone() const { return this->SystemIsWindowsPhone; }

2
Source/cmGlobalVisualStudio11Generator.cxx
View File

@@ -198,7 +198,7 @@ void cmGlobalVisualStudio11Generator::WriteSLNHeader(std::ostream& fout)
}
}
bool cmGlobalVisualStudio11Generator::UseFolderProperty()
bool cmGlobalVisualStudio11Generator::UseFolderProperty() const
{
// Intentionally skip up to the top-level class implementation.
// Folders are not supported by the Express editions in VS10 and earlier,

2
Source/cmGlobalVisualStudio11Generator.h
View File

@@ -44,7 +44,7 @@ protected:
bool IsWindowsStoreToolsetInstalled() const;
const char* GetIDEVersion() override { return "11.0"; }
bool UseFolderProperty();
bool UseFolderProperty() const override;
static std::set<std::string> GetInstalledWindowsCESDKs();
/** Return true if the configuration needs to be deployed */

8
Source/cmGlobalVisualStudio15Generator.cxx
View File

@@ -29,8 +29,8 @@ class cmGlobalVisualStudio15Generator::Factory
: public cmGlobalGeneratorFactory
{
public:
virtual cmGlobalGenerator* CreateGlobalGenerator(const std::string& name,
cmake* cm) const
cmGlobalGenerator* CreateGlobalGenerator(const std::string& name,
cmake* cm) const override
{
std::string genName;
const char* p = cmVS15GenName(name, genName);
@@ -52,14 +52,14 @@ public:
return 0;
}
virtual void GetDocumentation(cmDocumentationEntry& entry) const
void GetDocumentation(cmDocumentationEntry& entry) const override
{
entry.Name = std::string(vs15generatorName) + " [arch]";
entry.Brief = "Generates Visual Studio 2017 project files. "
"Optional [arch] can be \"Win64\" or \"ARM\".";
}
virtual void GetGenerators(std::vector<std::string>& names) const
void GetGenerators(std::vector<std::string>& names) const override
{
names.push_back(vs15generatorName);
names.push_back(vs15generatorName + std::string(" ARM"));

2
Source/cmGlobalVisualStudio71Generator.h
View File

@@ -37,7 +37,7 @@ protected:
void WriteSLNHeader(std::ostream& fout) override;
// Folders are not supported by VS 7.1.
virtual bool UseFolderProperty() { return false; }
bool UseFolderProperty() const override { return false; }
std::string ProjectConfigurationSectionName;
};

2
Source/cmGlobalVisualStudio8Generator.cxx
View File

@@ -78,7 +78,7 @@ void cmGlobalVisualStudio8Generator::Configure()
this->cmGlobalVisualStudio7Generator::Configure();
}
bool cmGlobalVisualStudio8Generator::UseFolderProperty()
bool cmGlobalVisualStudio8Generator::UseFolderProperty() const
{
return IsExpressEdition() ? false : cmGlobalGenerator::UseFolderProperty();
}

2
Source/cmGlobalVisualStudio8Generator.h
View File

@@ -73,7 +73,7 @@ protected:
const char* path,
const cmGeneratorTarget* t) override;
bool UseFolderProperty();
bool UseFolderProperty() const override;
std::string Name;
std::string WindowsCEVersion;

4
Source/cmGlobalVisualStudioGenerator.h
View File

@@ -118,7 +118,7 @@ public:
std::string ExpandCFGIntDir(const std::string& str,
const std::string& config) const override;
void ComputeTargetObjectDirectory(cmGeneratorTarget* gt) const;
void ComputeTargetObjectDirectory(cmGeneratorTarget* gt) const override;
std::string GetStartupProjectName(cmLocalGenerator const* root) const;
@@ -163,7 +163,7 @@ protected:
private:
virtual std::string GetVSMakeProgram() = 0;
void PrintCompilerAdvice(std::ostream&, std::string const&,
const char*) const
const char*) const override
{
}