diff options
| author | Andy Cedilnik <andy.cedilnik@kitware.com> | 2006-04-15 17:02:18 (GMT) |
|---|---|---|
| committer | Andy Cedilnik <andy.cedilnik@kitware.com> | 2006-04-15 17:02:18 (GMT) |
| commit | c09c3c6bfadb41bd0b43082642ce76abbf02df06 (patch) | |
| tree | d0aa5a228f589eddd9f75e0a980d8cf228326731 /Source/CPack/cmCPackNSISGenerator.cxx | |
| parent | 1df8e12c42a0ba6228059f456849010db5695ec3 (diff) | |
| download | CMake-c09c3c6bfadb41bd0b43082642ce76abbf02df06.zip CMake-c09c3c6bfadb41bd0b43082642ce76abbf02df06.tar.gz CMake-c09c3c6bfadb41bd0b43082642ce76abbf02df06.tar.bz2 | |
ENH: Support for packaging source, several cleanups and more yeehaa...
Diffstat (limited to 'Source/CPack/cmCPackNSISGenerator.cxx')
| -rw-r--r-- | Source/CPack/cmCPackNSISGenerator.cxx | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/Source/CPack/cmCPackNSISGenerator.cxx b/Source/CPack/cmCPackNSISGenerator.cxx index f4afea1..2f5363d 100644 --- a/Source/CPack/cmCPackNSISGenerator.cxx +++ b/Source/CPack/cmCPackNSISGenerator.cxx @@ -115,17 +115,14 @@ int cmCPackNSISGenerator::CompressFiles(const char* outFileName, } //---------------------------------------------------------------------- -int cmCPackNSISGenerator::Initialize(const char* name, cmMakefile* mf) +int cmCPackNSISGenerator::InitializeInternal() { - int res = this->Superclass::Initialize(name, mf); - if ( !res ) - { - return res; - } if ( cmSystemTools::IsOn(this->GetOption( "CPACK_INCLUDE_TOPLEVEL_DIRECTORY")) ) { - cmCPackLogger(cmCPackLog::LOG_ERROR, "NSIS Generator cannot work with CPACK_INCLUDE_TOPLEVEL_DIRECTORY. This option will be ignored." + cmCPackLogger(cmCPackLog::LOG_ERROR, + "NSIS Generator cannot work with CPACK_INCLUDE_TOPLEVEL_DIRECTORY. " + "This option will be ignored." << std::endl); this->SetOption("CPACK_INCLUDE_TOPLEVEL_DIRECTORY", 0); } @@ -222,7 +219,7 @@ int cmCPackNSISGenerator::Initialize(const char* name, cmMakefile* mf) this->SetOption("CPACK_NSIS_DELETE_ICONS", deleteStr.str().c_str()); } - return res; + return this->Superclass::InitializeInternal(); } //---------------------------------------------------------------------- |