diff options
author | Regina Pfeifer <regina@mailbox.org> | 2019-08-28 19:36:38 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2019-09-04 17:05:22 (GMT) |
commit | f7085d7b0a0d4cced41669b498a3d03c4a1e65df (patch) | |
tree | 51374aad15cc332b0337155ed3ab3c9d9c8f5d1b /Source/CPack/cmCPackCygwinSourceGenerator.cxx | |
parent | 787765d4025cd1caa842d9bcfcf6cd71222b9d44 (diff) | |
download | CMake-f7085d7b0a0d4cced41669b498a3d03c4a1e65df.zip CMake-f7085d7b0a0d4cced41669b498a3d03c4a1e65df.tar.gz CMake-f7085d7b0a0d4cced41669b498a3d03c4a1e65df.tar.bz2 |
cmCPackArchiveGenerator: Code cleanup
Diffstat (limited to 'Source/CPack/cmCPackCygwinSourceGenerator.cxx')
-rw-r--r-- | Source/CPack/cmCPackCygwinSourceGenerator.cxx | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/Source/CPack/cmCPackCygwinSourceGenerator.cxx b/Source/CPack/cmCPackCygwinSourceGenerator.cxx index 8cae9b4..5f6aab0 100644 --- a/Source/CPack/cmCPackCygwinSourceGenerator.cxx +++ b/Source/CPack/cmCPackCygwinSourceGenerator.cxx @@ -20,6 +20,7 @@ #endif cmCPackCygwinSourceGenerator::cmCPackCygwinSourceGenerator() + : cmCPackArchiveGenerator(cmArchiveWrite::CompressBZip2, "paxr", ".tar.bz2") { } @@ -40,11 +41,8 @@ int cmCPackCygwinSourceGenerator::PackageFiles() cmStrCat(this->GetOption("CPACK_TEMPORARY_DIRECTORY"), ".tar.bz2"); packageFileNames[0] = packageDirFileName; std::string output; - // skip one parent up to the cmCPackTarBZip2Generator - // to create tar.bz2 file with the list of source - // files - this->Compress = cmArchiveWrite::CompressBZip2; - if (!this->cmCPackTarBZip2Generator::PackageFiles()) { + // create tar.bz2 file with the list of source files + if (!this->cmCPackArchiveGenerator::PackageFiles()) { return 0; } // Now create a tar file that contains the above .tar.bz2 file @@ -130,7 +128,7 @@ int cmCPackCygwinSourceGenerator::PackageFiles() packageFileNames[0] = outerTarFile; /* update the toplevel dir */ toplevel = tmpDir; - if (!this->cmCPackTarBZip2Generator::PackageFiles()) { + if (!this->cmCPackArchiveGenerator::PackageFiles()) { return 0; } return 1; |