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/cmCPackZIPGenerator.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/cmCPackZIPGenerator.cxx')
| -rw-r--r-- | Source/CPack/cmCPackZIPGenerator.cxx | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/Source/CPack/cmCPackZIPGenerator.cxx b/Source/CPack/cmCPackZIPGenerator.cxx index 0781991..8297cc4 100644 --- a/Source/CPack/cmCPackZIPGenerator.cxx +++ b/Source/CPack/cmCPackZIPGenerator.cxx @@ -38,13 +38,9 @@ cmCPackZIPGenerator::~cmCPackZIPGenerator() } //---------------------------------------------------------------------- -int cmCPackZIPGenerator::Initialize(const char* name, cmMakefile* mf) +int cmCPackZIPGenerator::InitializeInternal() { - int res = this->Superclass::Initialize(name, mf); - if ( !res ) - { - return res; - } + this->SetOptionIfNotSet("CPACK_INCLUDE_TOPLEVEL_DIRECTORY", "1"); std::vector<std::string> path; std::string pkgPath = "c:/Program Files/WinZip"; path.push_back(pkgPath); @@ -68,7 +64,8 @@ int cmCPackZIPGenerator::Initialize(const char* name, cmMakefile* mf) pkgPath = cmSystemTools::FindProgram("zip", path, false); if ( pkgPath.empty() ) { - cmCPackLogger(cmCPackLog::LOG_DEBUG, "Cannot find unix ZIP" << std::endl); + cmCPackLogger(cmCPackLog::LOG_DEBUG, "Cannot find unix ZIP" + << std::endl); } else { @@ -83,9 +80,10 @@ int cmCPackZIPGenerator::Initialize(const char* name, cmMakefile* mf) return 0; } this->SetOption("CPACK_INSTALLER_PROGRAM", pkgPath.c_str()); - cmCPackLogger(cmCPackLog::LOG_VERBOSE, "Found ZIP program: " << pkgPath.c_str() + cmCPackLogger(cmCPackLog::LOG_VERBOSE, "Found ZIP program: " + << pkgPath.c_str() << std::endl); - return 1; + return this->Superclass::InitializeInternal(); } //---------------------------------------------------------------------- |