summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2016-07-22 14:42:37 (GMT)
committerBrad King <brad.king@kitware.com>2016-07-22 14:42:37 (GMT)
commit624b72159be327505c01f4d68ef6e67ac5f4335e (patch)
tree3fed7a210497126ad765b1cc62ee03a750b481bf
parent4e88b1ec17fb61399dcf3e7f5f722905899daf27 (diff)
downloadCMake-624b72159be327505c01f4d68ef6e67ac5f4335e.zip
CMake-624b72159be327505c01f4d68ef6e67ac5f4335e.tar.gz
CMake-624b72159be327505c01f4d68ef6e67ac5f4335e.tar.bz2
Source/CPack: Add CM_OVERRIDE on MacOS cmCPackGenerator overrides
-rw-r--r--Source/CPack/cmCPackBundleGenerator.h8
-rw-r--r--Source/CPack/cmCPackDragNDropGenerator.h10
-rw-r--r--Source/CPack/cmCPackOSXX11Generator.h8
-rw-r--r--Source/CPack/cmCPackPKGGenerator.h6
-rw-r--r--Source/CPack/cmCPackPackageMakerGenerator.h8
-rw-r--r--Source/CPack/cmCPackProductBuildGenerator.h6
6 files changed, 23 insertions, 23 deletions
diff --git a/Source/CPack/cmCPackBundleGenerator.h b/Source/CPack/cmCPackBundleGenerator.h
index 9cb2f0a..c6fa408 100644
--- a/Source/CPack/cmCPackBundleGenerator.h
+++ b/Source/CPack/cmCPackBundleGenerator.h
@@ -29,12 +29,12 @@ public:
virtual ~cmCPackBundleGenerator();
protected:
- virtual int InitializeInternal();
- virtual const char* GetPackagingInstallPrefix();
+ int InitializeInternal() CM_OVERRIDE;
+ const char* GetPackagingInstallPrefix() CM_OVERRIDE;
int ConstructBundle();
int SignBundle(const std::string& src_dir);
- int PackageFiles();
- bool SupportsComponentInstallation() const;
+ int PackageFiles() CM_OVERRIDE;
+ bool SupportsComponentInstallation() const CM_OVERRIDE;
std::string InstallPrefix;
};
diff --git a/Source/CPack/cmCPackDragNDropGenerator.h b/Source/CPack/cmCPackDragNDropGenerator.h
index 1392b21..a5f89f6 100644
--- a/Source/CPack/cmCPackDragNDropGenerator.h
+++ b/Source/CPack/cmCPackDragNDropGenerator.h
@@ -29,17 +29,17 @@ public:
virtual ~cmCPackDragNDropGenerator();
protected:
- virtual int InitializeInternal();
- virtual const char* GetOutputExtension();
- int PackageFiles();
- bool SupportsComponentInstallation() const;
+ int InitializeInternal() CM_OVERRIDE;
+ const char* GetOutputExtension() CM_OVERRIDE;
+ int PackageFiles() CM_OVERRIDE;
+ bool SupportsComponentInstallation() const CM_OVERRIDE;
bool CopyFile(std::ostringstream& source, std::ostringstream& target);
bool CreateEmptyFile(std::ostringstream& target, size_t size);
bool RunCommand(std::ostringstream& command, std::string* output = 0);
std::string GetComponentInstallDirNameSuffix(
- const std::string& componentName);
+ const std::string& componentName) CM_OVERRIDE;
int CreateDMG(const std::string& src_dir, const std::string& output_file);
diff --git a/Source/CPack/cmCPackOSXX11Generator.h b/Source/CPack/cmCPackOSXX11Generator.h
index adc05d2..d1d6789 100644
--- a/Source/CPack/cmCPackOSXX11Generator.h
+++ b/Source/CPack/cmCPackOSXX11Generator.h
@@ -32,10 +32,10 @@ public:
virtual ~cmCPackOSXX11Generator();
protected:
- virtual int InitializeInternal();
- int PackageFiles();
- virtual const char* GetPackagingInstallPrefix();
- virtual const char* GetOutputExtension() { return ".dmg"; }
+ virtual int InitializeInternal() CM_OVERRIDE;
+ int PackageFiles() CM_OVERRIDE;
+ const char* GetPackagingInstallPrefix() CM_OVERRIDE;
+ const char* GetOutputExtension() CM_OVERRIDE { return ".dmg"; }
// bool CopyCreateResourceFile(const std::string& name,
// const std::string& dir);
diff --git a/Source/CPack/cmCPackPKGGenerator.h b/Source/CPack/cmCPackPKGGenerator.h
index 8d10943..d2135cc 100644
--- a/Source/CPack/cmCPackPKGGenerator.h
+++ b/Source/CPack/cmCPackPKGGenerator.h
@@ -33,11 +33,11 @@ public:
cmCPackPKGGenerator();
virtual ~cmCPackPKGGenerator();
- virtual bool SupportsComponentInstallation() const;
+ bool SupportsComponentInstallation() const CM_OVERRIDE;
protected:
- virtual int InitializeInternal();
- virtual const char* GetOutputPostfix() { return "darwin"; }
+ int InitializeInternal() CM_OVERRIDE;
+ const char* GetOutputPostfix() CM_OVERRIDE { return "darwin"; }
// Copies or creates the resource file with the given name to the
// package or package staging directory dirName. The variable
diff --git a/Source/CPack/cmCPackPackageMakerGenerator.h b/Source/CPack/cmCPackPackageMakerGenerator.h
index 5192377..d1314a4 100644
--- a/Source/CPack/cmCPackPackageMakerGenerator.h
+++ b/Source/CPack/cmCPackPackageMakerGenerator.h
@@ -33,12 +33,12 @@ public:
*/
cmCPackPackageMakerGenerator();
virtual ~cmCPackPackageMakerGenerator();
- bool SupportsComponentInstallation() const;
+ bool SupportsComponentInstallation() const CM_OVERRIDE;
protected:
- virtual int InitializeInternal();
- int PackageFiles();
- virtual const char* GetOutputExtension() { return ".dmg"; }
+ int InitializeInternal() CM_OVERRIDE;
+ int PackageFiles() CM_OVERRIDE;
+ const char* GetOutputExtension() CM_OVERRIDE { return ".dmg"; }
// Run PackageMaker with the given command line, which will (if
// successful) produce the given package file. Returns true if
diff --git a/Source/CPack/cmCPackProductBuildGenerator.h b/Source/CPack/cmCPackProductBuildGenerator.h
index b05b50a..fd2c090 100644
--- a/Source/CPack/cmCPackProductBuildGenerator.h
+++ b/Source/CPack/cmCPackProductBuildGenerator.h
@@ -33,9 +33,9 @@ public:
virtual ~cmCPackProductBuildGenerator();
protected:
- virtual int InitializeInternal();
- int PackageFiles();
- virtual const char* GetOutputExtension() { return ".pkg"; }
+ int InitializeInternal() CM_OVERRIDE;
+ int PackageFiles() CM_OVERRIDE;
+ const char* GetOutputExtension() CM_OVERRIDE { return ".pkg"; }
// Run ProductBuild with the given command line, which will (if
// successful) produce the given package file. Returns true if