parent
9202d27465
commit
0ea4c7b784
|
@ -70,7 +70,8 @@ cmCPackGenerators::cmCPackGenerators()
|
|||
this->RegisterGenerator("OSXX11", "Mac OSX X11 bundle",
|
||||
cmCPackOSXX11Generator::CreateGenerator);
|
||||
#endif
|
||||
#if !defined(_WIN32) && !defined(__APPLE__) && !defined(__QNXNTO__) && !defined(__BEOS__)
|
||||
#if !defined(_WIN32) && !defined(__APPLE__) \
|
||||
&& !defined(__QNXNTO__) && !defined(__BEOS__)
|
||||
this->RegisterGenerator("DEB", "Debian packages",
|
||||
cmCPackDebGenerator::CreateGenerator);
|
||||
#endif
|
||||
|
|
|
@ -55,7 +55,8 @@ int cmCPackZIPGenerator::CompressFiles(const char* outFileName,
|
|||
std::string tempFileName;
|
||||
tempFileName = toplevel;
|
||||
tempFileName += "/winZip.filelist";
|
||||
bool needQuotesInFile = cmSystemTools::IsOn(this->GetOption("CPACK_ZIP_NEED_QUOTES"));
|
||||
bool needQuotesInFile =
|
||||
cmSystemTools::IsOn(this->GetOption("CPACK_ZIP_NEED_QUOTES"));
|
||||
|
||||
std::string cmd = this->GetOption("CPACK_ZIP_COMMAND");
|
||||
cmsys::SystemTools::ReplaceString(cmd, "<ARCHIVE>", outFileName);
|
||||
|
|
|
@ -246,7 +246,8 @@ int main (int argc, char *argv[])
|
|||
// find out which system cpack is running on, so it can setup the search
|
||||
// paths, so FIND_XXX() commands can be used in scripts
|
||||
cminst.AddCMakePaths(argv[0]);
|
||||
std::string systemFile = globalMF->GetModulesFile("CMakeDetermineSystem.cmake");
|
||||
std::string systemFile =
|
||||
globalMF->GetModulesFile("CMakeDetermineSystem.cmake");
|
||||
if (!globalMF->ReadListFile(0, systemFile.c_str()))
|
||||
{
|
||||
cmCPack_Log(&log, cmCPackLog::LOG_ERROR,
|
||||
|
@ -254,7 +255,8 @@ int main (int argc, char *argv[])
|
|||
return 1;
|
||||
}
|
||||
|
||||
systemFile = globalMF->GetModulesFile("CMakeSystemSpecificInformation.cmake");
|
||||
systemFile =
|
||||
globalMF->GetModulesFile("CMakeSystemSpecificInformation.cmake");
|
||||
if (!globalMF->ReadListFile(0, systemFile.c_str()))
|
||||
{
|
||||
cmCPack_Log(&log, cmCPackLog::LOG_ERROR,
|
||||
|
|
|
@ -313,7 +313,8 @@ void cmTryRunCommand::DoNotRunExecutable(const std::string& runArgs,
|
|||
static bool firstTryRun = true;
|
||||
std::string fileName = this->Makefile->GetHomeOutputDirectory();
|
||||
fileName += "/TryRunResults.cmake";
|
||||
std::ofstream file(fileName.c_str(), firstTryRun?std::ios::out : std::ios::app);
|
||||
std::ofstream file(fileName.c_str(),
|
||||
firstTryRun ? std::ios::out : std::ios::app);
|
||||
if ( file )
|
||||
{
|
||||
if (firstTryRun)
|
||||
|
|
Loading…
Reference in New Issue