summaryrefslogtreecommitdiffstats
path: root/Source/CPack/cmCPackRPMGenerator.h
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2017-09-15 13:56:26 (GMT)
committerBrad King <brad.king@kitware.com>2017-09-15 14:06:41 (GMT)
commit0b33aee48b1f4027fe6086b5610434a5f29b0b8a (patch)
treee2fc28dc511f61de6af3cbc550efdad03bfb9204 /Source/CPack/cmCPackRPMGenerator.h
parentc0c5f924fe46fcf83603117689b372cb8520c4bb (diff)
downloadCMake-0b33aee48b1f4027fe6086b5610434a5f29b0b8a.zip
CMake-0b33aee48b1f4027fe6086b5610434a5f29b0b8a.tar.gz
CMake-0b33aee48b1f4027fe6086b5610434a5f29b0b8a.tar.bz2
Use C++11 override instead of CM_OVERRIDE
We now require C++11 support including `override`. Drop use of the old compatibility macro. Convert references as follows: git grep -l CM_OVERRIDE -- '*.h' '*.hxx' '*.cxx' | xargs sed -i 's/CM_OVERRIDE/override/g'
Diffstat (limited to 'Source/CPack/cmCPackRPMGenerator.h')
-rw-r--r--Source/CPack/cmCPackRPMGenerator.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/Source/CPack/cmCPackRPMGenerator.h b/Source/CPack/cmCPackRPMGenerator.h
index bfba289..27d3b63 100644
--- a/Source/CPack/cmCPackRPMGenerator.h
+++ b/Source/CPack/cmCPackRPMGenerator.h
@@ -26,7 +26,7 @@ public:
* Construct generator
*/
cmCPackRPMGenerator();
- ~cmCPackRPMGenerator() CM_OVERRIDE;
+ ~cmCPackRPMGenerator() override;
static bool CanGenerate()
{
@@ -43,8 +43,8 @@ public:
}
protected:
- int InitializeInternal() CM_OVERRIDE;
- int PackageFiles() CM_OVERRIDE;
+ int InitializeInternal() override;
+ int PackageFiles() override;
/**
* This method factors out the work done in component packaging case.
*/
@@ -61,10 +61,10 @@ protected:
* components will be put in a single installer.
*/
int PackageComponentsAllInOne(const std::string& compInstDirName);
- const char* GetOutputExtension() CM_OVERRIDE { return ".rpm"; }
- bool SupportsComponentInstallation() const CM_OVERRIDE;
+ const char* GetOutputExtension() override { return ".rpm"; }
+ bool SupportsComponentInstallation() const override;
std::string GetComponentInstallDirNameSuffix(
- const std::string& componentName) CM_OVERRIDE;
+ const std::string& componentName) override;
void AddGeneratedPackageNames();
};