kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'more-virtual-override' 

624b7215 Source/CPack: Add CM_OVERRIDE on MacOS cmCPackGenerator overrides
This commit is contained in:
Brad King 2016-08-01 14:59:47 -04:00 committed by CMake Topic Stage
parent 2711c35a8d 624b72159b
commit bfac78d074
6 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/CPack/cmCPackBundleGenerator.h
View File

@ -29,12 +29,12 @@ public:
virtual ~cmCPackBundleGenerator(); virtual ~cmCPackBundleGenerator();
protected: protected:
virtual int InitializeInternal(); int InitializeInternal() CM_OVERRIDE;
virtual const char* GetPackagingInstallPrefix(); const char* GetPackagingInstallPrefix() CM_OVERRIDE;
int ConstructBundle(); int ConstructBundle();
int SignBundle(const std::string& src_dir); int SignBundle(const std::string& src_dir);
int PackageFiles(); int PackageFiles() CM_OVERRIDE;
bool SupportsComponentInstallation() const; bool SupportsComponentInstallation() const CM_OVERRIDE;
std::string InstallPrefix; std::string InstallPrefix;
}; };

10
Source/CPack/cmCPackDragNDropGenerator.h
View File

@ -29,17 +29,17 @@ public:
virtual ~cmCPackDragNDropGenerator(); virtual ~cmCPackDragNDropGenerator();
protected: protected:
virtual int InitializeInternal(); int InitializeInternal() CM_OVERRIDE;
virtual const char* GetOutputExtension(); const char* GetOutputExtension() CM_OVERRIDE;
int PackageFiles(); int PackageFiles() CM_OVERRIDE;
bool SupportsComponentInstallation() const; bool SupportsComponentInstallation() const CM_OVERRIDE;
bool CopyFile(std::ostringstream& source, std::ostringstream& target); bool CopyFile(std::ostringstream& source, std::ostringstream& target);
bool CreateEmptyFile(std::ostringstream& target, size_t size); bool CreateEmptyFile(std::ostringstream& target, size_t size);
bool RunCommand(std::ostringstream& command, std::string* output = 0); bool RunCommand(std::ostringstream& command, std::string* output = 0);
std::string GetComponentInstallDirNameSuffix( 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); int CreateDMG(const std::string& src_dir, const std::string& output_file);

8
Source/CPack/cmCPackOSXX11Generator.h
View File

@ -32,10 +32,10 @@ public:
virtual ~cmCPackOSXX11Generator(); virtual ~cmCPackOSXX11Generator();
protected: protected:
virtual int InitializeInternal(); virtual int InitializeInternal() CM_OVERRIDE;
int PackageFiles(); int PackageFiles() CM_OVERRIDE;
virtual const char* GetPackagingInstallPrefix(); const char* GetPackagingInstallPrefix() CM_OVERRIDE;
virtual const char* GetOutputExtension() { return ".dmg"; } const char* GetOutputExtension() CM_OVERRIDE { return ".dmg"; }
// bool CopyCreateResourceFile(const std::string& name, // bool CopyCreateResourceFile(const std::string& name,
// const std::string& dir); // const std::string& dir);

6
Source/CPack/cmCPackPKGGenerator.h
View File

@ -33,11 +33,11 @@ public:
cmCPackPKGGenerator(); cmCPackPKGGenerator();
virtual ~cmCPackPKGGenerator(); virtual ~cmCPackPKGGenerator();
virtual bool SupportsComponentInstallation() const; bool SupportsComponentInstallation() const CM_OVERRIDE;
protected: protected:
virtual int InitializeInternal(); int InitializeInternal() CM_OVERRIDE;
virtual const char* GetOutputPostfix() { return "darwin"; } const char* GetOutputPostfix() CM_OVERRIDE { return "darwin"; }
// Copies or creates the resource file with the given name to the // Copies or creates the resource file with the given name to the
// package or package staging directory dirName. The variable // package or package staging directory dirName. The variable

8
Source/CPack/cmCPackPackageMakerGenerator.h
View File

@ -33,12 +33,12 @@ public:
*/ */
cmCPackPackageMakerGenerator(); cmCPackPackageMakerGenerator();
virtual ~cmCPackPackageMakerGenerator(); virtual ~cmCPackPackageMakerGenerator();
bool SupportsComponentInstallation() const; bool SupportsComponentInstallation() const CM_OVERRIDE;
protected: protected:
virtual int InitializeInternal(); int InitializeInternal() CM_OVERRIDE;
int PackageFiles(); int PackageFiles() CM_OVERRIDE;
virtual const char* GetOutputExtension() { return ".dmg"; } const char* GetOutputExtension() CM_OVERRIDE { return ".dmg"; }
// Run PackageMaker with the given command line, which will (if // Run PackageMaker with the given command line, which will (if
// successful) produce the given package file. Returns true if // successful) produce the given package file. Returns true if

6
Source/CPack/cmCPackProductBuildGenerator.h
View File

@ -33,9 +33,9 @@ public:
virtual ~cmCPackProductBuildGenerator(); virtual ~cmCPackProductBuildGenerator();
protected: protected:
virtual int InitializeInternal(); int InitializeInternal() CM_OVERRIDE;
int PackageFiles(); int PackageFiles() CM_OVERRIDE;
virtual const char* GetOutputExtension() { return ".pkg"; } const char* GetOutputExtension() CM_OVERRIDE { return ".pkg"; }
// Run ProductBuild with the given command line, which will (if // Run ProductBuild with the given command line, which will (if
// successful) produce the given package file. Returns true if // successful) produce the given package file. Returns true if