diff options
| author | Andy Cedilnik <andy.cedilnik@kitware.com> | 2006-01-02 22:28:20 (GMT) |
|---|---|---|
| committer | Andy Cedilnik <andy.cedilnik@kitware.com> | 2006-01-02 22:28:20 (GMT) |
| commit | ebbe10193ff5f41c77f2e3cafae06f7c0f30c0c4 (patch) | |
| tree | f6dca7a842541b94f8261aa250a23cb349c8d343 /Source/CPack/cmCPackNSISGenerator.cxx | |
| parent | f00b344adac6ec59d5432311d3986a21582a62f9 (diff) | |
| download | CMake-ebbe10193ff5f41c77f2e3cafae06f7c0f30c0c4.zip CMake-ebbe10193ff5f41c77f2e3cafae06f7c0f30c0c4.tar.gz CMake-ebbe10193ff5f41c77f2e3cafae06f7c0f30c0c4.tar.bz2 | |
ENH: Start working on CPack input file and cleanups
Diffstat (limited to 'Source/CPack/cmCPackNSISGenerator.cxx')
| -rw-r--r-- | Source/CPack/cmCPackNSISGenerator.cxx | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/Source/CPack/cmCPackNSISGenerator.cxx b/Source/CPack/cmCPackNSISGenerator.cxx index 8dd31de..7706fbb 100644 --- a/Source/CPack/cmCPackNSISGenerator.cxx +++ b/Source/CPack/cmCPackNSISGenerator.cxx @@ -39,12 +39,6 @@ cmCPackNSISGenerator::~cmCPackNSISGenerator() } //---------------------------------------------------------------------- -int cmCPackNSISGenerator::ProcessGenerator() -{ - return this->Superclass::ProcessGenerator(); -} - -//---------------------------------------------------------------------- int cmCPackNSISGenerator::CompressFiles(const char* outFileName, const char* toplevel, const std::vector<std::string>& files) { @@ -84,10 +78,14 @@ int cmCPackNSISGenerator::CompressFiles(const char* outFileName, const char* top } //---------------------------------------------------------------------- -int cmCPackNSISGenerator::Initialize(const char* name) +int cmCPackNSISGenerator::Initialize(const char* name, cmMakefile* mf) { + int res = this->Superclass::Initialize(name, mf); + if ( !res ) + { + return res; + } cmCPackLogger(cmCPackLog::LOG_DEBUG, "cmCPackNSISGenerator::Initialize()" << std::endl); - int res = this->Superclass::Initialize(name); std::vector<std::string> path; std::string nsisPath; if ( !cmsys::SystemTools::ReadRegistryValue("HKEY_LOCAL_MACHINE\\SOFTWARE\\NSIS", |