reactos/CMake
1
0
Fork 0
mirror of https://github.com/reactos/CMake.git synced 2024-11-23 19:49:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

STYLE: fix line length

Browse Source
This commit is contained in:
Ken Martin 2006-05-10 13:56:27 -04:00
parent aae0bcdacf
commit 5ac59d81d3
3 changed files with 38 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Source/cmAuxSourceDirectoryCommand.h
View File

@ -66,19 +66,20 @@ public:
return
" AUX_SOURCE_DIRECTORY(dir VARIABLE)\n"
"Collects the names of all the source files in the specified "
"directory and stores the list in the variable provided. This command "
"is intended to be used by projects that use explicit template "
"instantiation. Template instantiation files can be stored in a "
"\"Templates\" subdirectory and collected automatically using this "
"command to avoid manually listing all instantiations.\n"
"It is tempting to use this command to avoid writing the list of source "
"files for a library or executable target. While this seems to work, "
"there is no way for CMake to generate a build system that knows when a "
"new source file has been added. Normally the generated build system "
"knows when it needs to rerun CMake because the CMakeLists.txt file "
"is modified to add a new source. When the source is just added to "
"the directory without modifying this file, one would have to manually "
"rerun CMake to generate a build system incorporating the new file.";
"directory and stores the list in the variable provided. This "
"command is intended to be used by projects that use explicit "
"template instantiation. Template instantiation files can be "
"stored in a \"Templates\" subdirectory and collected automatically "
"using this command to avoid manually listing all instantiations.\n"
"It is tempting to use this command to avoid writing the list of "
"source files for a library or executable target. While this seems "
"to work, there is no way for CMake to generate a build system that "
"knows when a new source file has been added. Normally the "
"generated build system knows when it needs to rerun CMake because "
"the CMakeLists.txt file is modified to add a new source. When the "
"source is just added to the directory without modifying this file, "
"one would have to manually rerun CMake to generate a build system "
"incorporating the new file.";
}
cmTypeMacro(cmAuxSourceDirectoryCommand, cmCommand);

36
Source/cmCTest.cxx
View File

@ -723,15 +723,16 @@ bool cmCTest::AddIfExists(SetOfStrings& files, const char* file)
//----------------------------------------------------------------------
bool cmCTest::CTestFileExists(const std::string& filename)
{
std::string testingDir = this->BinaryDir + "/Testing/" + this->CurrentTag + "/" +
filename;
std::string testingDir = this->BinaryDir + "/Testing/" +
this->CurrentTag + "/" + filename;
return cmSystemTools::FileExists(testingDir.c_str());
}
//----------------------------------------------------------------------
cmCTestGenericHandler* cmCTest::GetInitializedHandler(const char* handler)
{
cmCTest::t_TestingHandlers::iterator it = this->TestingHandlers.find(handler);
cmCTest::t_TestingHandlers::iterator it =
this->TestingHandlers.find(handler);
if ( it == this->TestingHandlers.end() )
{
return 0;
@ -743,7 +744,8 @@ cmCTestGenericHandler* cmCTest::GetInitializedHandler(const char* handler)
//----------------------------------------------------------------------
cmCTestGenericHandler* cmCTest::GetHandler(const char* handler)
{
cmCTest::t_TestingHandlers::iterator it = this->TestingHandlers.find(handler);
cmCTest::t_TestingHandlers::iterator it =
this->TestingHandlers.find(handler);
if ( it == this->TestingHandlers.end() )
{
return 0;
@ -1369,7 +1371,8 @@ int cmCTest::Run(std::vector<std::string>const& args, std::string* output)
this->ShowOnly = true;
}
if(this->CheckArgument(arg, "-SP", "--script-new-process") && i < args.size() - 1 )
if(this->CheckArgument(arg, "-SP", "--script-new-process") &&
i < args.size() - 1 )
{
this->RunConfigurationScript = true;
i++;
@ -1382,7 +1385,8 @@ int cmCTest::Run(std::vector<std::string>const& args, std::string* output)
}
}
if(this->CheckArgument(arg, "-SR", "--script-run") && i < args.size() - 1 )
if(this->CheckArgument(arg, "-SR", "--script-run") &&
i < args.size() - 1 )
{
SRArgumentSpecified = true;
this->RunConfigurationScript = true;
@ -1701,8 +1705,8 @@ int cmCTest::Run(std::vector<std::string>const& args, std::string* output)
i++;
this->GetHandler("test")->SetPersistentOption("TestsToRunInformation",
args[i].c_str());
this->GetHandler("memcheck")->SetPersistentOption("TestsToRunInformation",
args[i].c_str());
this->GetHandler("memcheck")->
SetPersistentOption("TestsToRunInformation",args[i].c_str());
}
if(this->CheckArgument(arg, "-U", "--union"))
{
@ -1712,20 +1716,20 @@ int cmCTest::Run(std::vector<std::string>const& args, std::string* output)
if(this->CheckArgument(arg, "-R", "--tests-regex") && i < args.size() - 1)
{
i++;
this->GetHandler("test")->SetPersistentOption("IncludeRegularExpression",
args[i].c_str());
this->GetHandler("memcheck")->SetPersistentOption("IncludeRegularExpression",
args[i].c_str());
this->GetHandler("test")->
SetPersistentOption("IncludeRegularExpression", args[i].c_str());
this->GetHandler("memcheck")->
SetPersistentOption("IncludeRegularExpression", args[i].c_str());
}
if(this->CheckArgument(arg, "-E", "--exclude-regex") &&
i < args.size() - 1)
{
i++;
this->GetHandler("test")->SetPersistentOption("ExcludeRegularExpression",
args[i].c_str());
this->GetHandler("memcheck")->SetPersistentOption("ExcludeRegularExpression",
args[i].c_str());
this->GetHandler("test")->
SetPersistentOption("ExcludeRegularExpression", args[i].c_str());
this->GetHandler("memcheck")->
SetPersistentOption("ExcludeRegularExpression", args[i].c_str());
}
if(this->CheckArgument(arg, "--overwrite") && i < args.size() - 1)

8
Source/cmCacheManager.cxx
View File

@ -423,8 +423,8 @@ bool cmCacheManager::SaveCache(const char* path)
fout << "########################\n";
fout << "\n";
for( std::map<cmStdString, CacheEntry>::const_iterator i = this->Cache.begin();
i != this->Cache.end(); ++i)
for( std::map<cmStdString, CacheEntry>::const_iterator i =
this->Cache.begin(); i != this->Cache.end(); ++i)
{
const CacheEntry& ce = (*i).second;
CacheEntryType t = ce.Type;
@ -724,8 +724,8 @@ void cmCacheManager::PrintCache(std::ostream& out) const
{
out << "=================================================" << std::endl;
out << "CMakeCache Contents:" << std::endl;
for(std::map<cmStdString, CacheEntry>::const_iterator i = this->Cache.begin();
i != this->Cache.end(); ++i)
for(std::map<cmStdString, CacheEntry>::const_iterator i =
this->Cache.begin(); i != this->Cache.end(); ++i)
{
if((*i).second.Type != INTERNAL)
{