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

STYLE: fix line length

This commit is contained in:
Ken Martin 2006-05-12 13:53:21 -04:00
parent 2bb24565e5
commit daa37f1163
17 changed files with 55 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/cmSeparateArgumentsCommand.cxx
View File

@ -17,7 +17,8 @@
#include "cmSeparateArgumentsCommand.h"
// cmSeparateArgumentsCommand
bool cmSeparateArgumentsCommand::InitialPass(std::vector<std::string> const& args)
bool cmSeparateArgumentsCommand
::InitialPass(std::vector<std::string> const& args)
{
if(args.size() != 1 )
{

3
Source/cmSeparateArgumentsCommand.h
View File

@ -56,7 +56,8 @@ public:
*/
virtual const char* GetTerseDocumentation()
{
return "Split space separated arguments into a semi-colon separated list.";
return
"Split space separated arguments into a semi-colon separated list.";
}
/**

9
Source/cmSetDirectoryPropertiesCommand.cxx
View File

@ -42,12 +42,14 @@ bool cmSetDirectoryPropertiesCommand::InitialPass(
const std::string& value = *(ait+1);
if ( prop == "VARIABLES" )
{
this->SetError("Variables and cache variables should be set using SET command");
this->SetError
("Variables and cache variables should be set using SET command");
return false;
}
else if ( prop == "MACROS" )
{
this->SetError("Commands and macros cannot be set using SET_CMAKE_PROPERTIES");
this->SetError
("Commands and macros cannot be set using SET_CMAKE_PROPERTIES");
return false;
}
else if ( prop == "INCLUDE_DIRECTORIES" )
@ -71,7 +73,8 @@ bool cmSetDirectoryPropertiesCommand::InitialPass(
if ( prop == "ADDITIONAL_MAKE_CLEAN_FILES" )
{
// This property is not inherrited
if ( strcmp(this->Makefile->GetCurrentDirectory(), this->Makefile->GetStartDirectory()) != 0 )
if ( strcmp(this->Makefile->GetCurrentDirectory(),
this->Makefile->GetStartDirectory()) != 0 )
{
continue;
}

9
Source/cmSetSourceFilesPropertiesCommand.h
View File

@ -60,11 +60,12 @@ public:
"to change, and then provide the values you want to set next. You "
"can make up your own properties as well. "
"The following are used by CMake. "
"The ABSTRACT flag (boolean) is used by some class wrapping commands. "
"The ABSTRACT flag (boolean) is used by some class wrapping "
"commands. "
"If WRAP_EXCLUDE (boolean) is true then many wrapping commands "
"will ignore this file. "
"If GENERATED (boolean) is true then it is not an error if this "
"source file does not exist when it is added to a target. Obviously, "
"will ignore this file. If GENERATED (boolean) is true then it "
"is not an error if this source file does not exist when it is "
"added to a target. Obviously, "
"it must be created (presumably by a custom command) before the "
"target is built. "
"If the HEADER_FILE_ONLY (boolean) property is true then dependency "

9
Source/cmSetTargetPropertiesCommand.cxx
View File

@ -59,13 +59,15 @@ bool cmSetTargetPropertiesCommand::InitialPass(
}
else
{
this->SetError("called with illegal arguments, maybe missing a PROPERTIES specifier?");
this->SetError("called with illegal arguments, maybe missing "
"a PROPERTIES specifier?");
return false;
}
}
if(propertyPairs.size() == 0)
{
this->SetError("called with illegal arguments, maybe missing a PROPERTIES specifier?");
this->SetError("called with illegal arguments, maybe missing "
"a PROPERTIES specifier?");
return false;
}
@ -83,7 +85,8 @@ bool cmSetTargetPropertiesCommand::InitialPass(
// now loop through all the props and set them
for (k = 0; k < propertyPairs.size(); k = k + 2)
{
target.SetProperty(propertyPairs[k].c_str(),propertyPairs[k+1].c_str());
target.SetProperty(propertyPairs[k].c_str(),
propertyPairs[k+1].c_str());
}
}
// if file is not already in the makefile, then add it

5
Source/cmSetTargetPropertiesCommand.h
View File

@ -81,8 +81,9 @@ public:
"variable for executables)."
"\n"
"The LINK_FLAGS property can be used to add extra flags to the "
"link step of a target. LINK_FLAGS_<CONFIG> will add to the configuration "
"<CONFIG>, for example, DEBUG, RELEASE, MINSIZEREL, RELWITHDEBINFO. "
"link step of a target. LINK_FLAGS_<CONFIG> will add to the "
"configuration <CONFIG>, "
"for example, DEBUG, RELEASE, MINSIZEREL, RELWITHDEBINFO. "
"DEFINE_SYMBOL sets the name of the preprocessor symbol defined when "
"compiling sources in a shared library. "
"If not set here then it is set to target_EXPORTS by default "

9
Source/cmSetTestsPropertiesCommand.cxx
View File

@ -62,13 +62,15 @@ bool cmSetTestsPropertiesCommand::InitialPass(
}
else
{
this->SetError("called with illegal arguments, maybe missing a PROPERTIES specifier?");
this->SetError("called with illegal arguments, maybe "
"missing a PROPERTIES specifier?");
return false;
}
}
if(propertyPairs.size() == 0)
{
this->SetError("called with illegal arguments, maybe missing a PROPERTIES specifier?");
this->SetError("called with illegal arguments, maybe "
"missing a PROPERTIES specifier?");
return false;
}
@ -89,7 +91,8 @@ bool cmSetTestsPropertiesCommand::InitialPass(
// now loop through all the props and set them
for (k = 0; k < propertyPairs.size(); k = k + 2)
{
test->SetProperty(propertyPairs[k].c_str(),propertyPairs[k+1].c_str());
test->SetProperty(propertyPairs[k].c_str(),
propertyPairs[k+1].c_str());
}
found = true;
break;

8
Source/cmSetTestsPropertiesCommand.h
View File

@ -54,8 +54,8 @@ public:
return
" SET_TESTS_PROPERTIES(test1 [test2...] PROPERTIES prop1 value1 prop2"
" value2)\n"
"Set a property for the tests. If the property is not found, CMake will "
"report an error. The properties include:\n"
"Set a property for the tests. If the property is not found, CMake "
"will report an error. The properties include:\n"
"WILL_FAIL: If set to true, this will invert the pass/fail flag of the"
" test.\n"
"PASS_REGULAR_EXPRESSION: If set, the test output will be checked "
@ -66,8 +66,8 @@ public:
"FAIL_REGULAR_EXPRESSION: If set, if the output will match to one of "
"specified regular expressions, the test will fail.\n"
" Example: PASS_REGULAR_EXPRESSION \"[^a-z]Error;ERROR;Failed\"\n"
"Both PASS_REGULAR_EXPRESSION and FAIL_REGULAR_EXPRESSION expect a list "
"of regular expressions.\n";
"Both PASS_REGULAR_EXPRESSION and FAIL_REGULAR_EXPRESSION expect a "
"list of regular expressions.\n";
}
cmTypeMacro(cmSetTestsPropertiesCommand, cmCommand);

6
Source/cmSiteNameCommand.cxx
View File

@ -55,9 +55,9 @@ bool cmSiteNameCommand::InitialPass(std::vector<std::string> const& args)
std::string siteName = "unknown";
#if defined(_WIN32) && !defined(__CYGWIN__)
std::string host;
if(cmSystemTools::ReadRegistryValue(
"HKEY_LOCAL_MACHINE\\System\\CurrentControlSet\\Control\\ComputerName\\ComputerName;ComputerName",
host))
if(cmSystemTools::ReadRegistryValue
("HKEY_LOCAL_MACHINE\\System\\CurrentControlSet\\"
"Control\\ComputerName\\ComputerName;ComputerName", host))
{
siteName = host;
}

4
Source/cmSourceFile.cxx
View File

@ -65,8 +65,8 @@ bool cmSourceFile::SetName(const char* name, const char* dir,
}
// See if the file is a header file
if(std::find( headerExts.begin(), headerExts.end(), this->SourceExtension ) ==
headerExts.end())
if(std::find( headerExts.begin(), headerExts.end(),
this->SourceExtension ) == headerExts.end())
{
this->SetProperty("HEADER_FILE_ONLY","0");
}

3
Source/cmSourceFile.h
View File

@ -93,7 +93,8 @@ public:
/**
* The file extension associated with source file
*/
const std::string &GetSourceExtension() const {return this->SourceExtension;}
const std::string &GetSourceExtension() const {
return this->SourceExtension;}
void SetSourceExtension(const char *name) {this->SourceExtension = name;}
/**

3
Source/cmSourceGroupCommand.h
View File

@ -61,7 +61,8 @@ public:
virtual const char* GetFullDocumentation()
{
return
" SOURCE_GROUP(name [REGULAR_EXPRESSION regex] [FILES src1 src2 ...])\n"
" SOURCE_GROUP(name [REGULAR_EXPRESSION regex] "
"[FILES src1 src2 ...])\n"
"Defines a group into which sources will be placed in project files. "
"This is mainly used to setup file tabs in Visual Studio. "
"Any file whose name is listed or matches the regular expression will "

3
Source/cmStringCommand.cxx
View File

@ -587,7 +587,8 @@ bool cmStringCommand::HandleSubstringCommand(std::vector<std::string> const&
}
//----------------------------------------------------------------------------
bool cmStringCommand::HandleLengthCommand(std::vector<std::string> const& args)
bool cmStringCommand
::HandleLengthCommand(std::vector<std::string> const& args)
{
if(args.size() != 3)
{

3
Source/cmSubdirCommand.cxx
View File

@ -43,7 +43,8 @@ bool cmSubdirCommand::InitialPass(std::vector<std::string> const& args)
}
// if they specified a relative path then compute the full
std::string srcPath = std::string(this->Makefile->GetCurrentDirectory()) +
std::string srcPath =
std::string(this->Makefile->GetCurrentDirectory()) +
"/" + i->c_str();
if (cmSystemTools::FileIsDirectory(srcPath.c_str()))
{

4
Source/cmSubdirCommand.h
View File

@ -62,8 +62,8 @@ public:
virtual const char* GetFullDocumentation()
{
return
" SUBDIRS(dir1 dir2 ...[EXCLUDE_FROM_ALL exclude_dir1 exclude_dir2 ...]"
" [PREORDER] )\n"
" SUBDIRS(dir1 dir2 ..."
"[EXCLUDE_FROM_ALL exclude_dir1 exclude_dir2 ...] [PREORDER] )\n"
"Add a list of subdirectories to the build. The ADD_SUBDIRECTORY "
"command should be used instead of SUBDIRS although SUBDIRS will "
"still work. "

7
Source/cmSystemTools.cxx
View File

@ -84,7 +84,8 @@ const char* cmSystemTools::GetWindows9xComspecSubstitute()
return cmSystemTools::s_Windows9xComspecSubstitute.c_str();
}
void (*cmSystemTools::s_ErrorCallback)(const char*, const char*, bool&, void*);
void (*cmSystemTools::s_ErrorCallback)(const char*, const char*,
bool&, void*);
void (*cmSystemTools::s_StdoutCallback)(const char*, int len, void*);
void* cmSystemTools::s_ErrorCallbackClientData = 0;
void* cmSystemTools::s_StdoutCallbackClientData = 0;
@ -1254,8 +1255,8 @@ std::string cmSystemTools::RelativePath(const char* local, const char* remote)
}
if(!cmSystemTools::FileIsFullPath(remote))
{
cmSystemTools::Error("RelativePath must be passed a full path to remote: ",
remote);
cmSystemTools::Error
("RelativePath must be passed a full path to remote: ", remote);
}
return cmsys::SystemTools::RelativePath(local, remote);
}

3
Source/cmSystemTools.h
View File

@ -320,7 +320,8 @@ public:
/** Create tar */
static bool ListTar(const char* outFileName,
std::vector<cmStdString>& files, bool gzip, bool verbose);
std::vector<cmStdString>& files,
bool gzip, bool verbose);
static bool CreateTar(const char* outFileName,
const std::vector<cmStdString>& files, bool gzip,
bool verbose);