Skip to content
Snippets Groups Projects
Commit 0c4f1e3f authored by Bill Hoffman's avatar Bill Hoffman
Browse files

ENH: merge changes from main tree

parent e2c41d84
No related branches found
No related tags found
No related merge requests found
Changes in CMake 2.4.2
* Fix CPack ZIP on windows command line problem
* Find executables with no extension on windows mingw
* Fix FindQt3 to use QTDIR over path
......
......@@ -90,13 +90,16 @@ int cmCPackZIPGenerator::InitializeInternal()
int cmCPackZIPGenerator::CompressFiles(const char* outFileName,
const char* toplevel, const std::vector<std::string>& files)
{
std::string tempFileName;
cmOStringStream dmgCmd;
switch ( this->ZipStyle )
{
case cmCPackZIPGenerator::StyleWinZip:
tempFileName = toplevel;
tempFileName += "/winZip.filelist";
dmgCmd << "\"" << this->GetOption("CPACK_INSTALLER_PROGRAM")
<< "\" -P \"" << outFileName
<< "\"";
<< "\" @\"" << tempFileName.c_str() << "\"";
break;
case cmCPackZIPGenerator::StyleUnixZip:
dmgCmd << "\"" << this->GetOption("CPACK_INSTALLER_PROGRAM")
......@@ -108,12 +111,26 @@ int cmCPackZIPGenerator::CompressFiles(const char* outFileName,
<< std::endl);
return 0;
}
if(tempFileName.size())
{
cmGeneratedFileStream out(tempFileName.c_str());
std::vector<std::string>::const_iterator fileIt;
for ( fileIt = files.begin(); fileIt != files.end(); ++ fileIt )
{
out << "\""
<< cmSystemTools::RelativePath(toplevel, fileIt->c_str())
<< "\"" << std::endl;
}
}
else
{
std::vector<std::string>::const_iterator fileIt;
for ( fileIt = files.begin(); fileIt != files.end(); ++ fileIt )
{
dmgCmd << " \""
<< cmSystemTools::RelativePath(toplevel, fileIt->c_str())
<< "\"";
}
}
std::string output;
int retVal = -1;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment