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

STYLE: fix line length

Browse Source
This commit is contained in:
Ken Martin 2006-05-10 15:56:00 -04:00
parent 2af4710525
commit 71b993560b
6 changed files with 30 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/cmGeneratedFileStream.cxx
View File

@ -44,7 +44,8 @@ cmGeneratedFileStream::cmGeneratedFileStream(const char* name, bool quiet):
// Check if the file opened. // Check if the file opened.
if(!*this && !quiet) if(!*this && !quiet)
{ {
cmSystemTools::Error("Cannot open file for write: ", this->TempName.c_str()); cmSystemTools::Error("Cannot open file for write: ",
this->TempName.c_str());
cmSystemTools::ReportLastSystemError(""); cmSystemTools::ReportLastSystemError("");
} }
} }
@ -70,7 +71,8 @@ cmGeneratedFileStream::Open(const char* name, bool quiet, bool binaryFlag)
// Open the temporary output file. // Open the temporary output file.
if ( binaryFlag ) if ( binaryFlag )
{ {
this->Stream::open(this->TempName.c_str(), std::ios::out | std::ios::binary); this->Stream::open(this->TempName.c_str(),
std::ios::out | std::ios::binary);
} }
else else
{ {
@ -80,7 +82,8 @@ cmGeneratedFileStream::Open(const char* name, bool quiet, bool binaryFlag)
// Check if the file opened. // Check if the file opened.
if(!*this && !quiet) if(!*this && !quiet)
{ {
cmSystemTools::Error("Cannot open file for write: ", this->TempName.c_str()); cmSystemTools::Error("Cannot open file for write: ",
this->TempName.c_str());
cmSystemTools::ReportLastSystemError(""); cmSystemTools::ReportLastSystemError("");
} }
return *this; return *this;

8
Source/cmGetDirectoryPropertyCommand.cxx
View File

@ -60,7 +60,9 @@ bool cmGetDirectoryPropertyCommand::InitialPass(
if (!lg) if (!lg)
{ {
this->SetError this->SetError
("DIRECTORY argument provided but requested directory not found. This could be because the directory argument was invalid or, it is valid but has not been processed yet."); ("DIRECTORY argument provided but requested directory not found. "
"This could be because the directory argument was invalid or, "
"it is valid but has not been processed yet.");
return false; return false;
} }
dir = lg->GetMakefile(); dir = lg->GetMakefile();
@ -140,8 +142,8 @@ bool cmGetDirectoryPropertyCommand::InitialPass(
++i; ++i;
if (i == args.end()) if (i == args.end())
{ {
this->SetError this->SetError("A request for a variable definition was made without "
("A request for a variable definition was made without providing the name of the variable to get."); "providing the name of the variable to get.");
return false; return false;
} }
output = dir->GetSafeDefinition(i->c_str()); output = dir->GetSafeDefinition(i->c_str());

24
Source/cmGetFilenameComponentCommand.cxx
View File

@ -18,7 +18,8 @@
#include "cmSystemTools.h" #include "cmSystemTools.h"
// cmGetFilenameComponentCommand // cmGetFilenameComponentCommand
bool cmGetFilenameComponentCommand::InitialPass(std::vector<std::string> const& args) bool cmGetFilenameComponentCommand
::InitialPass(std::vector<std::string> const& args)
{ {
if(args.size() < 3) if(args.size() < 3)
{ {
@ -63,7 +64,8 @@ bool cmGetFilenameComponentCommand::InitialPass(std::vector<std::string> const&
} }
} }
} }
cmSystemTools::SplitProgramFromArgs(filename.c_str(), result, programArgs); cmSystemTools::SplitProgramFromArgs(filename.c_str(),
result, programArgs);
} }
else if (args[2] == "EXT") else if (args[2] == "EXT")
{ {
@ -102,17 +104,15 @@ bool cmGetFilenameComponentCommand::InitialPass(std::vector<std::string> const&
{ {
if(programArgs.size() && storeArgs.size()) if(programArgs.size() && storeArgs.size())
{ {
this->Makefile->AddCacheDefinition(storeArgs.c_str(), this->Makefile->AddCacheDefinition
programArgs.c_str(), (storeArgs.c_str(), programArgs.c_str(),
"", "", args[2] == "PATH" ? cmCacheManager::FILEPATH
args[2] == "PATH" ? cmCacheManager::FILEPATH : cmCacheManager::STRING);
: cmCacheManager::STRING);
} }
this->Makefile->AddCacheDefinition(args[0].c_str(), this->Makefile->AddCacheDefinition
result.c_str(), (args[0].c_str(), result.c_str(), "",
"", args[2] == "PATH" ? cmCacheManager::FILEPATH
args[2] == "PATH" ? cmCacheManager::FILEPATH : cmCacheManager::STRING);
: cmCacheManager::STRING);
} }
else else
{ {

4
Source/cmGetFilenameComponentCommand.h
View File

@ -73,8 +73,8 @@ public:
"extension (EXT), file name without extension (NAME_WE) of FileName, " "extension (EXT), file name without extension (NAME_WE) of FileName, "
"or the full absolute (ABSOLUTE) file name without symlinks. " "or the full absolute (ABSOLUTE) file name without symlinks. "
"Note that the path is converted to Unix slashes format and has no " "Note that the path is converted to Unix slashes format and has no "
"trailing slashes. The longest file extension is always considered. If " "trailing slashes. The longest file extension is always considered. "
"the optional CACHE argument is specified, the result variable is " "If the optional CACHE argument is specified, the result variable is "
"added to the cache.\n" "added to the cache.\n"
" GET_FILENAME_COMPONENT(VarName FileName\n" " GET_FILENAME_COMPONENT(VarName FileName\n"
" PROGRAM [PROGRAM_ARGS ArgVar]\n" " PROGRAM [PROGRAM_ARGS ArgVar]\n"

2
Source/cmGetSourceFilePropertyCommand.h
View File

@ -55,7 +55,7 @@ public:
" GET_SOURCE_FILE_PROPERTY(VAR file property)\n" " GET_SOURCE_FILE_PROPERTY(VAR file property)\n"
"Get a property from a source file. The value of the property is " "Get a property from a source file. The value of the property is "
"stored in the variable VAR. If the property is not found, VAR " "stored in the variable VAR. If the property is not found, VAR "
"will be set to \"NOTFOUND\". Use SET_SOURCE_FILES_PROPERTIES to set " "will be set to \"NOTFOUND\". Use SET_SOURCE_FILES_PROPERTIES to set "
"property values. Source file properties usually control how the " "property values. Source file properties usually control how the "
"file is built. One property that is always there is LOCATION"; "file is built. One property that is always there is LOCATION";
} }

7
Source/cmGlobalBorlandMakefileGenerator.cxx
View File

@ -28,8 +28,8 @@ cmGlobalBorlandMakefileGenerator::cmGlobalBorlandMakefileGenerator()
} }
void cmGlobalBorlandMakefileGenerator::EnableLanguage(std::vector<std::string>const& l, void cmGlobalBorlandMakefileGenerator
cmMakefile *mf) ::EnableLanguage(std::vector<std::string>const& l, cmMakefile *mf)
{ {
std::string outdir = this->CMakeInstance->GetStartOutputDirectory(); std::string outdir = this->CMakeInstance->GetStartOutputDirectory();
mf->AddDefinition("BORLAND", "1"); mf->AddDefinition("BORLAND", "1");
@ -55,7 +55,8 @@ cmLocalGenerator *cmGlobalBorlandMakefileGenerator::CreateLocalGenerator()
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
void cmGlobalBorlandMakefileGenerator::GetDocumentation(cmDocumentationEntry& entry) const void cmGlobalBorlandMakefileGenerator
::GetDocumentation(cmDocumentationEntry& entry) const
{ {
entry.name = this->GetName(); entry.name = this->GetName();
entry.brief = "Generates Borland makefiles."; entry.brief = "Generates Borland makefiles.";