kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

STYLE: fix line lengths 

Alex
This commit is contained in:
Alexander Neundorf 2007-07-26 08:40:51 -04:00
parent 9202d27465
commit 0ea4c7b784
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/CPack/cmCPackGenerators.cxx
View File

@ -70,7 +70,8 @@ cmCPackGenerators::cmCPackGenerators()
this->RegisterGenerator("OSXX11", "Mac OSX X11 bundle", this->RegisterGenerator("OSXX11", "Mac OSX X11 bundle",
cmCPackOSXX11Generator::CreateGenerator); cmCPackOSXX11Generator::CreateGenerator);
#endif #endif
#if !defined(_WIN32) && !defined(__APPLE__) && !defined(__QNXNTO__) && !defined(__BEOS__) #if !defined(_WIN32) && !defined(__APPLE__) \
&& !defined(__QNXNTO__) && !defined(__BEOS__)
this->RegisterGenerator("DEB", "Debian packages", this->RegisterGenerator("DEB", "Debian packages",
cmCPackDebGenerator::CreateGenerator); cmCPackDebGenerator::CreateGenerator);
#endif #endif

3
Source/CPack/cmCPackZIPGenerator.cxx
View File

@ -55,7 +55,8 @@ int cmCPackZIPGenerator::CompressFiles(const char* outFileName,
std::string tempFileName; std::string tempFileName;
tempFileName = toplevel; tempFileName = toplevel;
tempFileName += "/winZip.filelist"; 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"); std::string cmd = this->GetOption("CPACK_ZIP_COMMAND");
cmsys::SystemTools::ReplaceString(cmd, "<ARCHIVE>", outFileName); cmsys::SystemTools::ReplaceString(cmd, "<ARCHIVE>", outFileName);

6
Source/CPack/cpack.cxx
View File

@ -246,7 +246,8 @@ int main (int argc, char *argv[])
// find out which system cpack is running on, so it can setup the search // find out which system cpack is running on, so it can setup the search
// paths, so FIND_XXX() commands can be used in scripts // paths, so FIND_XXX() commands can be used in scripts
cminst.AddCMakePaths(argv[0]); 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())) if (!globalMF->ReadListFile(0, systemFile.c_str()))
{ {
cmCPack_Log(&log, cmCPackLog::LOG_ERROR, cmCPack_Log(&log, cmCPackLog::LOG_ERROR,
@ -254,7 +255,8 @@ int main (int argc, char *argv[])
return 1; return 1;
} }
systemFile = globalMF->GetModulesFile("CMakeSystemSpecificInformation.cmake"); systemFile =
globalMF->GetModulesFile("CMakeSystemSpecificInformation.cmake");
if (!globalMF->ReadListFile(0, systemFile.c_str())) if (!globalMF->ReadListFile(0, systemFile.c_str()))
{ {
cmCPack_Log(&log, cmCPackLog::LOG_ERROR, cmCPack_Log(&log, cmCPackLog::LOG_ERROR,

3
Source/cmTryRunCommand.cxx
View File

@ -313,7 +313,8 @@ void cmTryRunCommand::DoNotRunExecutable(const std::string& runArgs,
static bool firstTryRun = true; static bool firstTryRun = true;
std::string fileName = this->Makefile->GetHomeOutputDirectory(); std::string fileName = this->Makefile->GetHomeOutputDirectory();
fileName += "/TryRunResults.cmake"; 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 ( file )
{ {
if (firstTryRun) if (firstTryRun)