Browse Source

Make cmCPackGenerator not inherit from cmObject

pull/279/head
Daniel Pfeifer 9 years ago
parent
commit
2214011f7b
  1. 2
      Source/CPack/cmCPackArchiveGenerator.h
  2. 9
      Source/CPack/cmCPackGenerator.h

2
Source/CPack/cmCPackArchiveGenerator.h

@ -23,7 +23,7 @@ class cmCPackComponent;
class cmCPackArchiveGenerator : public cmCPackGenerator
{
public:
cmTypeMacro(cmCPackArchiveGenerator, cmCPackGenerator);
typedef cmCPackGenerator Superclass;
/**
* Construct generator

9
Source/CPack/cmCPackGenerator.h

@ -20,7 +20,8 @@ class cmInstalledFile;
class cmMakefile;
#define cmCPackTypeMacro(klass, superclass) \
cmTypeMacro(klass, superclass); \
typedef superclass Superclass; \
const char* GetNameOfClass() CM_OVERRIDE { return #klass; } \
static cmCPackGenerator* CreateGenerator() { return new klass; } \
class cmCPackTypeMacro_UseTrailingSemicolon
@ -36,10 +37,10 @@ class cmMakefile;
* \brief A superclass of all CPack Generators
*
*/
class cmCPackGenerator : public cmObject
class cmCPackGenerator
{
public:
cmTypeMacro(cmCPackGenerator, cmObject);
virtual const char* GetNameOfClass() = 0;
/**
* If verbose then more information is printed out
*/
@ -83,7 +84,7 @@ public:
* Construct generator
*/
cmCPackGenerator();
~cmCPackGenerator() CM_OVERRIDE;
virtual ~cmCPackGenerator();
//! Set and get the options
void SetOption(const std::string& op, const char* value);

Loading…
Cancel
Save