summaryrefslogtreecommitdiffstats
path: root/Source/CPack/cmCPackCygwinBinaryGenerator.cxx
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2009-11-03 14:40:57 (GMT)
committerBill Hoffman <bill.hoffman@kitware.com>2009-11-03 14:40:57 (GMT)
commit78b2d5097cc3b5d96f67d3f90ca92f7418043bc0 (patch)
treef855d0d44f9a5d239fc83284accc6172ae708537 /Source/CPack/cmCPackCygwinBinaryGenerator.cxx
parent1b1d954f7ec2aa49a0eccefed1a5b2b11886fd06 (diff)
downloadCMake-78b2d5097cc3b5d96f67d3f90ca92f7418043bc0.zip
CMake-78b2d5097cc3b5d96f67d3f90ca92f7418043bc0.tar.gz
CMake-78b2d5097cc3b5d96f67d3f90ca92f7418043bc0.tar.bz2
Fix cygwin package stuff to work with libarchive
Diffstat (limited to 'Source/CPack/cmCPackCygwinBinaryGenerator.cxx')
-rw-r--r--Source/CPack/cmCPackCygwinBinaryGenerator.cxx14
1 files changed, 1 insertions, 13 deletions
diff --git a/Source/CPack/cmCPackCygwinBinaryGenerator.cxx b/Source/CPack/cmCPackCygwinBinaryGenerator.cxx
index 8a7679c..853a1be 100644
--- a/Source/CPack/cmCPackCygwinBinaryGenerator.cxx
+++ b/Source/CPack/cmCPackCygwinBinaryGenerator.cxx
@@ -25,7 +25,6 @@
//----------------------------------------------------------------------
cmCPackCygwinBinaryGenerator::cmCPackCygwinBinaryGenerator()
{
- this->Compress = false;
}
//----------------------------------------------------------------------
@@ -38,18 +37,6 @@ int cmCPackCygwinBinaryGenerator::InitializeInternal()
{
this->SetOptionIfNotSet("CPACK_PACKAGING_INSTALL_PREFIX", "/usr");
this->SetOptionIfNotSet("CPACK_INCLUDE_TOPLEVEL_DIRECTORY", "0");
- std::vector<std::string> path;
- std::string pkgPath = cmSystemTools::FindProgram("bzip2", path, false);
- if ( pkgPath.empty() )
- {
- cmCPackLogger(cmCPackLog::LOG_ERROR, "Cannot find BZip2" << std::endl);
- return 0;
- }
- this->SetOptionIfNotSet("CPACK_INSTALLER_PROGRAM", pkgPath.c_str());
- cmCPackLogger(cmCPackLog::LOG_VERBOSE, "Found Compress program: "
- << pkgPath.c_str()
- << std::endl);
-
return this->Superclass::InitializeInternal();
}
@@ -85,6 +72,7 @@ int cmCPackCygwinBinaryGenerator::CompressFiles(const char* outFileName,
// add the manifest file to the list of all files
std::vector<std::string> filesWithManifest = files;
filesWithManifest.push_back(manifestFile);
+
// create the bzip2 tar file
return this->Superclass::CompressFiles(outFileName, toplevel,
filesWithManifest);