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

ENH: change name

Browse Source
This commit is contained in:
Bill Hoffman 2007-11-05 16:55:45 -05:00
parent 62decc533b
commit 743cec67d5
13 changed files with 72 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/CMakeLists.txt
View File

@ -308,7 +308,7 @@ TARGET_LINK_LIBRARIES(CTestLib CMakeLib ${CMAKE_CURL_LIBRARIES} ${CMAKE_XMLRPC_L
# #
SET(CPACK_SRCS SET(CPACK_SRCS
CPack/cmCPackGeneratorFactory.cxx CPack/cmCPackGeneratorFactory.cxx
CPack/cmCPackGenericGenerator.cxx CPack/cmCPackGenerator.cxx
CPack/cmCPackLog.cxx CPack/cmCPackLog.cxx
CPack/cmCPackNSISGenerator.cxx CPack/cmCPackNSISGenerator.cxx
CPack/cmCPackSTGZGenerator.cxx CPack/cmCPackSTGZGenerator.cxx

6
Source/CPack/cmCPackDebGenerator.h
View File

@ -19,16 +19,16 @@
#define cmCPackDebGenerator_h #define cmCPackDebGenerator_h
#include "cmCPackGenericGenerator.h" #include "cmCPackGenerator.h"
/** \class cmCPackDebGenerator /** \class cmCPackDebGenerator
* \brief A generator for Debian packages * \brief A generator for Debian packages
* *
*/ */
class cmCPackDebGenerator : public cmCPackGenericGenerator class cmCPackDebGenerator : public cmCPackGenerator
{ {
public: public:
cmCPackTypeMacro(cmCPackDebGenerator, cmCPackGenericGenerator); cmCPackTypeMacro(cmCPackDebGenerator, cmCPackGenerator);
/** /**
* Construct generator * Construct generator

58
Source/CPack/cmCPackGenericGenerator.cxx → Source/CPack/cmCPackGenerator.cxx
View File

@ -15,7 +15,7 @@
=========================================================================*/ =========================================================================*/
#include "cmCPackGenericGenerator.h" #include "cmCPackGenerator.h"
#include "cmMakefile.h" #include "cmMakefile.h"
#include "cmCPackLog.h" #include "cmCPackLog.h"
@ -29,7 +29,7 @@
#include <memory> // auto_ptr #include <memory> // auto_ptr
//---------------------------------------------------------------------- //----------------------------------------------------------------------
cmCPackGenericGenerator::cmCPackGenericGenerator() cmCPackGenerator::cmCPackGenerator()
{ {
this->GeneratorVerbose = false; this->GeneratorVerbose = false;
this->MakefileMap = 0; this->MakefileMap = 0;
@ -37,20 +37,20 @@ cmCPackGenericGenerator::cmCPackGenericGenerator()
} }
//---------------------------------------------------------------------- //----------------------------------------------------------------------
cmCPackGenericGenerator::~cmCPackGenericGenerator() cmCPackGenerator::~cmCPackGenerator()
{ {
this->MakefileMap = 0; this->MakefileMap = 0;
} }
//---------------------------------------------------------------------- //----------------------------------------------------------------------
void cmCPackGenericGeneratorProgress(const char *msg, float prog, void* ptr) void cmCPackGeneratorProgress(const char *msg, float prog, void* ptr)
{ {
cmCPackGenericGenerator* self = static_cast<cmCPackGenericGenerator*>(ptr); cmCPackGenerator* self = static_cast<cmCPackGenerator*>(ptr);
self->DisplayVerboseOutput(msg, prog); self->DisplayVerboseOutput(msg, prog);
} }
//---------------------------------------------------------------------- //----------------------------------------------------------------------
void cmCPackGenericGenerator::DisplayVerboseOutput(const char* msg, void cmCPackGenerator::DisplayVerboseOutput(const char* msg,
float progress) float progress)
{ {
(void)progress; (void)progress;
@ -58,7 +58,7 @@ void cmCPackGenericGenerator::DisplayVerboseOutput(const char* msg,
} }
//---------------------------------------------------------------------- //----------------------------------------------------------------------
int cmCPackGenericGenerator::PrepareNames() int cmCPackGenerator::PrepareNames()
{ {
std::string tempDirectory = this->GetOption("CPACK_PACKAGE_DIRECTORY"); std::string tempDirectory = this->GetOption("CPACK_PACKAGE_DIRECTORY");
@ -148,7 +148,7 @@ int cmCPackGenericGenerator::PrepareNames()
} }
//---------------------------------------------------------------------- //----------------------------------------------------------------------
int cmCPackGenericGenerator::InstallProject() int cmCPackGenerator::InstallProject()
{ {
cmCPackLogger(cmCPackLog::LOG_OUTPUT, "Install projects" << std::endl); cmCPackLogger(cmCPackLog::LOG_OUTPUT, "Install projects" << std::endl);
this->CleanTemporaryDirectory(); this->CleanTemporaryDirectory();
@ -221,7 +221,7 @@ int cmCPackGenericGenerator::InstallProject()
} }
//---------------------------------------------------------------------- //----------------------------------------------------------------------
int cmCPackGenericGenerator::InstallProjectViaInstallCommands( int cmCPackGenerator::InstallProjectViaInstallCommands(
bool setDestDir, const char* tempInstallDirectory) bool setDestDir, const char* tempInstallDirectory)
{ {
(void)setDestDir; (void)setDestDir;
@ -265,7 +265,7 @@ int cmCPackGenericGenerator::InstallProjectViaInstallCommands(
} }
//---------------------------------------------------------------------- //----------------------------------------------------------------------
int cmCPackGenericGenerator::InstallProjectViaInstalledDirectories( int cmCPackGenerator::InstallProjectViaInstalledDirectories(
bool setDestDir, const char* tempInstallDirectory) bool setDestDir, const char* tempInstallDirectory)
{ {
(void)setDestDir; (void)setDestDir;
@ -365,7 +365,7 @@ int cmCPackGenericGenerator::InstallProjectViaInstalledDirectories(
} }
//---------------------------------------------------------------------- //----------------------------------------------------------------------
int cmCPackGenericGenerator::InstallProjectViaInstallScript( int cmCPackGenerator::InstallProjectViaInstallScript(
bool setDestDir, const char* tempInstallDirectory) bool setDestDir, const char* tempInstallDirectory)
{ {
const char* cmakeScripts const char* cmakeScripts
@ -434,7 +434,7 @@ int cmCPackGenericGenerator::InstallProjectViaInstallScript(
} }
//---------------------------------------------------------------------- //----------------------------------------------------------------------
int cmCPackGenericGenerator::InstallProjectViaInstallCMakeProjects( int cmCPackGenerator::InstallProjectViaInstallCMakeProjects(
bool setDestDir, const char* tempInstallDirectory) bool setDestDir, const char* tempInstallDirectory)
{ {
const char* cmakeProjects const char* cmakeProjects
@ -537,7 +537,7 @@ int cmCPackGenericGenerator::InstallProjectViaInstallCMakeProjects(
cmCPackLogger(cmCPackLog::LOG_OUTPUT, cmCPackLogger(cmCPackLog::LOG_OUTPUT,
"- Install project: " << installProjectName << std::endl); "- Install project: " << installProjectName << std::endl);
cmake cm; cmake cm;
cm.SetProgressCallback(cmCPackGenericGeneratorProgress, this); cm.SetProgressCallback(cmCPackGeneratorProgress, this);
cmGlobalGenerator gg; cmGlobalGenerator gg;
gg.SetCMakeInstance(&cm); gg.SetCMakeInstance(&cm);
std::auto_ptr<cmLocalGenerator> lg(gg.CreateLocalGenerator()); std::auto_ptr<cmLocalGenerator> lg(gg.CreateLocalGenerator());
@ -609,14 +609,14 @@ int cmCPackGenericGenerator::InstallProjectViaInstallCMakeProjects(
} }
//---------------------------------------------------------------------- //----------------------------------------------------------------------
bool cmCPackGenericGenerator::ReadListFile(const char* moduleName) bool cmCPackGenerator::ReadListFile(const char* moduleName)
{ {
std::string fullPath = this->MakefileMap->GetModulesFile(moduleName); std::string fullPath = this->MakefileMap->GetModulesFile(moduleName);
return this->MakefileMap->ReadListFile(0, fullPath.c_str()); return this->MakefileMap->ReadListFile(0, fullPath.c_str());
} }
//---------------------------------------------------------------------- //----------------------------------------------------------------------
void cmCPackGenericGenerator::SetOptionIfNotSet(const char* op, void cmCPackGenerator::SetOptionIfNotSet(const char* op,
const char* value) const char* value)
{ {
const char* def = this->MakefileMap->GetDefinition(op); const char* def = this->MakefileMap->GetDefinition(op);
@ -628,7 +628,7 @@ void cmCPackGenericGenerator::SetOptionIfNotSet(const char* op,
} }
//---------------------------------------------------------------------- //----------------------------------------------------------------------
void cmCPackGenericGenerator::SetOption(const char* op, const char* value) void cmCPackGenerator::SetOption(const char* op, const char* value)
{ {
if ( !op ) if ( !op )
{ {
@ -645,7 +645,7 @@ void cmCPackGenericGenerator::SetOption(const char* op, const char* value)
} }
//---------------------------------------------------------------------- //----------------------------------------------------------------------
int cmCPackGenericGenerator::ProcessGenerator() int cmCPackGenerator::ProcessGenerator()
{ {
cmCPackLogger(cmCPackLog::LOG_OUTPUT, cmCPackLogger(cmCPackLog::LOG_OUTPUT,
"Create package using " << this->Name.c_str() << std::endl); "Create package using " << this->Name.c_str() << std::endl);
@ -742,7 +742,7 @@ int cmCPackGenericGenerator::ProcessGenerator()
} }
//---------------------------------------------------------------------- //----------------------------------------------------------------------
int cmCPackGenericGenerator::Initialize(const char* name, cmMakefile* mf, int cmCPackGenerator::Initialize(const char* name, cmMakefile* mf,
const char* argv0) const char* argv0)
{ {
this->MakefileMap = mf; this->MakefileMap = mf;
@ -777,25 +777,25 @@ int cmCPackGenericGenerator::Initialize(const char* name, cmMakefile* mf,
} }
//---------------------------------------------------------------------- //----------------------------------------------------------------------
int cmCPackGenericGenerator::InitializeInternal() int cmCPackGenerator::InitializeInternal()
{ {
return 1; return 1;
} }
//---------------------------------------------------------------------- //----------------------------------------------------------------------
bool cmCPackGenericGenerator::IsSet(const char* name) const bool cmCPackGenerator::IsSet(const char* name) const
{ {
return this->MakefileMap->IsSet(name); return this->MakefileMap->IsSet(name);
} }
//---------------------------------------------------------------------- //----------------------------------------------------------------------
const char* cmCPackGenericGenerator::GetOption(const char* op) const char* cmCPackGenerator::GetOption(const char* op)
{ {
return this->MakefileMap->GetDefinition(op); return this->MakefileMap->GetDefinition(op);
} }
//---------------------------------------------------------------------- //----------------------------------------------------------------------
int cmCPackGenericGenerator::FindRunningCMake(const char* arg0) int cmCPackGenerator::FindRunningCMake(const char* arg0)
{ {
int found = 0; int found = 0;
// Find our own executable. // Find our own executable.
@ -957,7 +957,7 @@ int cmCPackGenericGenerator::FindRunningCMake(const char* arg0)
} }
//---------------------------------------------------------------------- //----------------------------------------------------------------------
int cmCPackGenericGenerator::CompressFiles(const char* outFileName, int cmCPackGenerator::CompressFiles(const char* outFileName,
const char* toplevel, const std::vector<std::string>& files) const char* toplevel, const std::vector<std::string>& files)
{ {
(void)outFileName; (void)outFileName;
@ -967,7 +967,7 @@ int cmCPackGenericGenerator::CompressFiles(const char* outFileName,
} }
//---------------------------------------------------------------------- //----------------------------------------------------------------------
const char* cmCPackGenericGenerator::GetInstallPath() const char* cmCPackGenerator::GetInstallPath()
{ {
if ( !this->InstallPath.empty() ) if ( !this->InstallPath.empty() )
{ {
@ -1000,7 +1000,7 @@ const char* cmCPackGenericGenerator::GetInstallPath()
} }
//---------------------------------------------------------------------- //----------------------------------------------------------------------
const char* cmCPackGenericGenerator::GetPackagingInstallPrefix() const char* cmCPackGenerator::GetPackagingInstallPrefix()
{ {
cmCPackLogger(cmCPackLog::LOG_DEBUG, "GetPackagingInstallPrefix: '" cmCPackLogger(cmCPackLog::LOG_DEBUG, "GetPackagingInstallPrefix: '"
<< this->GetOption("CPACK_PACKAGING_INSTALL_PREFIX") << "'" << std::endl); << this->GetOption("CPACK_PACKAGING_INSTALL_PREFIX") << "'" << std::endl);
@ -1009,7 +1009,7 @@ const char* cmCPackGenericGenerator::GetPackagingInstallPrefix()
} }
//---------------------------------------------------------------------- //----------------------------------------------------------------------
std::string cmCPackGenericGenerator::FindTemplate(const char* name) std::string cmCPackGenerator::FindTemplate(const char* name)
{ {
cmCPackLogger(cmCPackLog::LOG_DEBUG, "Look for template: " cmCPackLogger(cmCPackLog::LOG_DEBUG, "Look for template: "
<< (name ? name : "(NULL)") << std::endl); << (name ? name : "(NULL)") << std::endl);
@ -1020,7 +1020,7 @@ std::string cmCPackGenericGenerator::FindTemplate(const char* name)
} }
//---------------------------------------------------------------------- //----------------------------------------------------------------------
bool cmCPackGenericGenerator::ConfigureString(const std::string& inString, bool cmCPackGenerator::ConfigureString(const std::string& inString,
std::string& outString) std::string& outString)
{ {
this->MakefileMap->ConfigureString(inString, this->MakefileMap->ConfigureString(inString,
@ -1029,7 +1029,7 @@ bool cmCPackGenericGenerator::ConfigureString(const std::string& inString,
} }
//---------------------------------------------------------------------- //----------------------------------------------------------------------
bool cmCPackGenericGenerator::ConfigureFile(const char* inName, bool cmCPackGenerator::ConfigureFile(const char* inName,
const char* outName, bool copyOnly /* = false */) const char* outName, bool copyOnly /* = false */)
{ {
return this->MakefileMap->ConfigureFile(inName, outName, return this->MakefileMap->ConfigureFile(inName, outName,
@ -1037,7 +1037,7 @@ bool cmCPackGenericGenerator::ConfigureFile(const char* inName,
} }
//---------------------------------------------------------------------- //----------------------------------------------------------------------
int cmCPackGenericGenerator::CleanTemporaryDirectory() int cmCPackGenerator::CleanTemporaryDirectory()
{ {
std::string tempInstallDirectoryWithPostfix std::string tempInstallDirectoryWithPostfix
= this->GetOption("CPACK_TEMPORARY_INSTALL_DIRECTORY"); = this->GetOption("CPACK_TEMPORARY_INSTALL_DIRECTORY");

16
Source/CPack/cmCPackGenericGenerator.h → Source/CPack/cmCPackGenerator.h
View File

@ -15,14 +15,14 @@
=========================================================================*/ =========================================================================*/
#ifndef cmCPackGenericGenerator_h #ifndef cmCPackGenerator_h
#define cmCPackGenericGenerator_h #define cmCPackGenerator_h
#include "cmObject.h" #include "cmObject.h"
#define cmCPackTypeMacro(class, superclass) \ #define cmCPackTypeMacro(class, superclass) \
cmTypeMacro(class, superclass); \ cmTypeMacro(class, superclass); \
static cmCPackGenericGenerator* CreateGenerator() { return new class; } static cmCPackGenerator* CreateGenerator() { return new class; }
#define cmCPackLogger(logType, msg) \ #define cmCPackLogger(logType, msg) \
do { \ do { \
@ -45,14 +45,14 @@
class cmMakefile; class cmMakefile;
class cmCPackLog; class cmCPackLog;
/** \class cmCPackGenericGenerator /** \class cmCPackGenerator
* \brief A superclass of all CPack Generators * \brief A superclass of all CPack Generators
* *
*/ */
class cmCPackGenericGenerator : public cmObject class cmCPackGenerator : public cmObject
{ {
public: public:
cmTypeMacro(cmCPackGenericGenerator, cmObject); cmTypeMacro(cmCPackGenerator, cmObject);
/** /**
* If verbose then more informaiton is printed out * If verbose then more informaiton is printed out
*/ */
@ -72,8 +72,8 @@ public:
/** /**
* Construct generator * Construct generator
*/ */
cmCPackGenericGenerator(); cmCPackGenerator();
virtual ~cmCPackGenericGenerator(); virtual ~cmCPackGenerator();
//! Set and get the options //! Set and get the options
void SetOption(const char* op, const char* value); void SetOption(const char* op, const char* value);

10
Source/CPack/cmCPackGeneratorFactory.cxx
View File

@ -17,7 +17,7 @@
#include "cmCPackGeneratorFactory.h" #include "cmCPackGeneratorFactory.h"
#include "cmCPackGenericGenerator.h" #include "cmCPackGenerator.h"
#include "cmCPackTGZGenerator.h" #include "cmCPackTGZGenerator.h"
#include "cmCPackTarBZip2Generator.h" #include "cmCPackTarBZip2Generator.h"
#include "cmCPackTarCompressGenerator.h" #include "cmCPackTarCompressGenerator.h"
@ -83,7 +83,7 @@ cmCPackGeneratorFactory::cmCPackGeneratorFactory()
//---------------------------------------------------------------------- //----------------------------------------------------------------------
cmCPackGeneratorFactory::~cmCPackGeneratorFactory() cmCPackGeneratorFactory::~cmCPackGeneratorFactory()
{ {
std::vector<cmCPackGenericGenerator*>::iterator it; std::vector<cmCPackGenerator*>::iterator it;
for ( it = this->Generators.begin(); it != this->Generators.end(); ++ it ) for ( it = this->Generators.begin(); it != this->Generators.end(); ++ it )
{ {
delete *it; delete *it;
@ -91,9 +91,9 @@ cmCPackGeneratorFactory::~cmCPackGeneratorFactory()
} }
//---------------------------------------------------------------------- //----------------------------------------------------------------------
cmCPackGenericGenerator* cmCPackGeneratorFactory::NewGenerator(const char* name) cmCPackGenerator* cmCPackGeneratorFactory::NewGenerator(const char* name)
{ {
cmCPackGenericGenerator* gen = this->NewGeneratorInternal(name); cmCPackGenerator* gen = this->NewGeneratorInternal(name);
if ( !gen ) if ( !gen )
{ {
return 0; return 0;
@ -104,7 +104,7 @@ cmCPackGenericGenerator* cmCPackGeneratorFactory::NewGenerator(const char* name)
} }
//---------------------------------------------------------------------- //----------------------------------------------------------------------
cmCPackGenericGenerator* cmCPackGeneratorFactory::NewGeneratorInternal( cmCPackGenerator* cmCPackGeneratorFactory::NewGeneratorInternal(
const char* name) const char* name)
{ {
if ( !name ) if ( !name )

12
Source/CPack/cmCPackGeneratorFactory.h
View File

@ -21,7 +21,7 @@
#include "cmObject.h" #include "cmObject.h"
class cmCPackLog; class cmCPackLog;
class cmCPackGenericGenerator; class cmCPackGenerator;
/** \class cmCPackGeneratorFactory /** \class cmCPackGeneratorFactory
* \brief A container for CPack generators * \brief A container for CPack generators
@ -36,10 +36,10 @@ public:
~cmCPackGeneratorFactory(); ~cmCPackGeneratorFactory();
//! Get the generator //! Get the generator
cmCPackGenericGenerator* NewGenerator(const char* name); cmCPackGenerator* NewGenerator(const char* name);
void DeleteGenerator(cmCPackGenericGenerator* gen); void DeleteGenerator(cmCPackGenerator* gen);
typedef cmCPackGenericGenerator* CreateGeneratorCall(); typedef cmCPackGenerator* CreateGeneratorCall();
void RegisterGenerator(const char* name, void RegisterGenerator(const char* name,
const char* generatorDescription, const char* generatorDescription,
@ -52,8 +52,8 @@ public:
{ return this->GeneratorDescriptions; } { return this->GeneratorDescriptions; }
private: private:
cmCPackGenericGenerator* NewGeneratorInternal(const char* name); cmCPackGenerator* NewGeneratorInternal(const char* name);
std::vector<cmCPackGenericGenerator*> Generators; std::vector<cmCPackGenerator*> Generators;
typedef std::map<cmStdString, CreateGeneratorCall*> t_GeneratorCreatorsMap; typedef std::map<cmStdString, CreateGeneratorCall*> t_GeneratorCreatorsMap;
t_GeneratorCreatorsMap GeneratorCreators; t_GeneratorCreatorsMap GeneratorCreators;

6
Source/CPack/cmCPackNSISGenerator.h
View File

@ -19,17 +19,17 @@
#define cmCPackNSISGenerator_h #define cmCPackNSISGenerator_h
#include "cmCPackGenericGenerator.h" #include "cmCPackGenerator.h"
/** \class cmCPackNSISGenerator /** \class cmCPackNSISGenerator
* \brief A generator for NSIS files * \brief A generator for NSIS files
* *
* http://people.freebsd.org/~kientzle/libarchive/ * http://people.freebsd.org/~kientzle/libarchive/
*/ */
class cmCPackNSISGenerator : public cmCPackGenericGenerator class cmCPackNSISGenerator : public cmCPackGenerator
{ {
public: public:
cmCPackTypeMacro(cmCPackNSISGenerator, cmCPackGenericGenerator); cmCPackTypeMacro(cmCPackNSISGenerator, cmCPackGenerator);
/** /**
* Construct generator * Construct generator

6
Source/CPack/cmCPackOSXX11Generator.h
View File

@ -18,17 +18,17 @@
#ifndef cmCPackOSXX11Generator_h #ifndef cmCPackOSXX11Generator_h
#define cmCPackOSXX11Generator_h #define cmCPackOSXX11Generator_h
#include "cmCPackGenericGenerator.h" #include "cmCPackGenerator.h"
/** \class cmCPackOSXX11Generator /** \class cmCPackOSXX11Generator
* \brief A generator for OSX X11 modules * \brief A generator for OSX X11 modules
* *
* Based on Gimp.app * Based on Gimp.app
*/ */
class cmCPackOSXX11Generator : public cmCPackGenericGenerator class cmCPackOSXX11Generator : public cmCPackGenerator
{ {
public: public:
cmCPackTypeMacro(cmCPackOSXX11Generator, cmCPackGenericGenerator); cmCPackTypeMacro(cmCPackOSXX11Generator, cmCPackGenerator);
/** /**
* Construct generator * Construct generator

6
Source/CPack/cmCPackPackageMakerGenerator.h
View File

@ -19,7 +19,7 @@
#define cmCPackPackageMakerGenerator_h #define cmCPackPackageMakerGenerator_h
#include "cmCPackGenericGenerator.h" #include "cmCPackGenerator.h"
/** \class cmCPackPackageMakerGenerator /** \class cmCPackPackageMakerGenerator
* \brief A generator for PackageMaker files * \brief A generator for PackageMaker files
@ -27,10 +27,10 @@
* http://developer.apple.com/documentation/Darwin * http://developer.apple.com/documentation/Darwin
* /Reference/ManPages/man1/packagemaker.1.html * /Reference/ManPages/man1/packagemaker.1.html
*/ */
class cmCPackPackageMakerGenerator : public cmCPackGenericGenerator class cmCPackPackageMakerGenerator : public cmCPackGenerator
{ {
public: public:
cmCPackTypeMacro(cmCPackPackageMakerGenerator, cmCPackGenericGenerator); cmCPackTypeMacro(cmCPackPackageMakerGenerator, cmCPackGenerator);
/** /**
* Construct generator * Construct generator

6
Source/CPack/cmCPackRPMGenerator.h
View File

@ -19,7 +19,7 @@
#define cmCPackRPMGenerator_h #define cmCPackRPMGenerator_h
#include "cmCPackGenericGenerator.h" #include "cmCPackGenerator.h"
/** \class cmCPackRPMGenerator /** \class cmCPackRPMGenerator
* \brief A generator for RPM packages * \brief A generator for RPM packages
@ -29,10 +29,10 @@
* will only 'execute' (aka ->ReadListFile) several * will only 'execute' (aka ->ReadListFile) several
* CMake macros files. * CMake macros files.
*/ */
class cmCPackRPMGenerator : public cmCPackGenericGenerator class cmCPackRPMGenerator : public cmCPackGenerator
{ {
public: public:
cmCPackTypeMacro(cmCPackRPMGenerator, cmCPackGenericGenerator); cmCPackTypeMacro(cmCPackRPMGenerator, cmCPackGenerator);
/** /**
* Construct generator * Construct generator

6
Source/CPack/cmCPackTGZGenerator.h
View File

@ -18,7 +18,7 @@
#ifndef cmCPackTGZGenerator_h #ifndef cmCPackTGZGenerator_h
#define cmCPackTGZGenerator_h #define cmCPackTGZGenerator_h
#include "cmCPackGenericGenerator.h" #include "cmCPackGenerator.h"
class cmCPackTGZGeneratorForward; class cmCPackTGZGeneratorForward;
@ -27,11 +27,11 @@ class cmCPackTGZGeneratorForward;
* *
* http://people.freebsd.org/~kientzle/libarchive/ * http://people.freebsd.org/~kientzle/libarchive/
*/ */
class cmCPackTGZGenerator : public cmCPackGenericGenerator class cmCPackTGZGenerator : public cmCPackGenerator
{ {
public: public:
friend class cmCPackTGZGeneratorForward; friend class cmCPackTGZGeneratorForward;
cmCPackTypeMacro(cmCPackTGZGenerator, cmCPackGenericGenerator); cmCPackTypeMacro(cmCPackTGZGenerator, cmCPackGenerator);
/** /**
* Construct generator * Construct generator

6
Source/CPack/cmCPackZIPGenerator.h
View File

@ -18,18 +18,18 @@
#ifndef cmCPackZIPGenerator_h #ifndef cmCPackZIPGenerator_h
#define cmCPackZIPGenerator_h #define cmCPackZIPGenerator_h
#include "cmCPackGenericGenerator.h" #include "cmCPackGenerator.h"
class cmCPackZIPGeneratorForward; class cmCPackZIPGeneratorForward;
/** \class cmCPackZIPGenerator /** \class cmCPackZIPGenerator
* \brief A generator for ZIP files * \brief A generator for ZIP files
*/ */
class cmCPackZIPGenerator : public cmCPackGenericGenerator class cmCPackZIPGenerator : public cmCPackGenerator
{ {
public: public:
friend class cmCPackZIPGeneratorForward; friend class cmCPackZIPGeneratorForward;
cmCPackTypeMacro(cmCPackZIPGenerator, cmCPackGenericGenerator); cmCPackTypeMacro(cmCPackZIPGenerator, cmCPackGenerator);
/** /**
* Construct generator * Construct generator

4
Source/CPack/cpack.cxx
View File

@ -20,7 +20,7 @@
#include "cmake.h" #include "cmake.h"
#include "cmDocumentation.h" #include "cmDocumentation.h"
#include "cmCPackGeneratorFactory.h" #include "cmCPackGeneratorFactory.h"
#include "cmCPackGenericGenerator.h" #include "cmCPackGenerator.h"
#include "cmake.h" #include "cmake.h"
#include "cmGlobalGenerator.h" #include "cmGlobalGenerator.h"
#include "cmLocalGenerator.h" #include "cmLocalGenerator.h"
@ -234,7 +234,7 @@ int main (int argc, char *argv[])
cmCPackGeneratorFactory generators; cmCPackGeneratorFactory generators;
generators.SetLogger(&log); generators.SetLogger(&log);
cmCPackGenericGenerator* cpackGenerator = 0; cmCPackGenerator* cpackGenerator = 0;
if ( !helpFull.empty() || !helpMAN.empty() || if ( !helpFull.empty() || !helpMAN.empty() ||
!helpHTML.empty() || helpVersion ) !helpHTML.empty() || helpVersion )