Merge topic 'run-vim-spellcheck'
43d6011
Run vim spellcheck on some files
This commit is contained in:
commit
20446079ee
|
@ -27,7 +27,7 @@
|
||||||
This file computes an ordered list of link items to use when linking a
|
This file computes an ordered list of link items to use when linking a
|
||||||
single target in one configuration. Each link item is identified by
|
single target in one configuration. Each link item is identified by
|
||||||
the string naming it. A graph of dependencies is created in which
|
the string naming it. A graph of dependencies is created in which
|
||||||
each node corresponds to one item and directed eges lead from nodes to
|
each node corresponds to one item and directed edges lead from nodes to
|
||||||
those which must *follow* them on the link line. For example, the
|
those which must *follow* them on the link line. For example, the
|
||||||
graph
|
graph
|
||||||
|
|
||||||
|
@ -42,7 +42,7 @@ search of the link dependencies starting from the main target.
|
||||||
|
|
||||||
There are two types of items: those with known direct dependencies and
|
There are two types of items: those with known direct dependencies and
|
||||||
those without known dependencies. We will call the two types "known
|
those without known dependencies. We will call the two types "known
|
||||||
items" and "unknown items", respecitvely. Known items are those whose
|
items" and "unknown items", respectively. Known items are those whose
|
||||||
names correspond to targets (built or imported) and those for which an
|
names correspond to targets (built or imported) and those for which an
|
||||||
old-style <item>_LIB_DEPENDS variable is defined. All other items are
|
old-style <item>_LIB_DEPENDS variable is defined. All other items are
|
||||||
unknown and we must infer dependencies for them. For items that look
|
unknown and we must infer dependencies for them. For items that look
|
||||||
|
@ -150,7 +150,7 @@ times the component needs to be seen (once for trivial components,
|
||||||
twice for non-trivial). If at any time another component finishes and
|
twice for non-trivial). If at any time another component finishes and
|
||||||
re-adds an already pending component, the pending component is reset
|
re-adds an already pending component, the pending component is reset
|
||||||
so that it needs to be seen in its entirety again. This ensures that
|
so that it needs to be seen in its entirety again. This ensures that
|
||||||
all dependencies of a component are satisified no matter where it
|
all dependencies of a component are satisfied no matter where it
|
||||||
appears.
|
appears.
|
||||||
|
|
||||||
After the original link line has been completed, we append to it the
|
After the original link line has been completed, we append to it the
|
||||||
|
|
|
@ -31,7 +31,7 @@ dependencies for each target such that no cycles are left and the
|
||||||
build order is safe.
|
build order is safe.
|
||||||
|
|
||||||
For most target types cyclic dependencies are not allowed. However
|
For most target types cyclic dependencies are not allowed. However
|
||||||
STATIC libraries may depend on each other in a cyclic fasion. In
|
STATIC libraries may depend on each other in a cyclic fashion. In
|
||||||
general the directed dependency graph forms a directed-acyclic-graph
|
general the directed dependency graph forms a directed-acyclic-graph
|
||||||
of strongly connected components. All strongly connected components
|
of strongly connected components. All strongly connected components
|
||||||
should consist of only STATIC_LIBRARY targets.
|
should consist of only STATIC_LIBRARY targets.
|
||||||
|
|
|
@ -153,11 +153,11 @@ int cmCoreTryCompile::TryCompileCode(std::vector<std::string> const& argv)
|
||||||
std::string ccFile = this->BinaryDirectory + "/CMakeCache.txt";
|
std::string ccFile = this->BinaryDirectory + "/CMakeCache.txt";
|
||||||
cmSystemTools::RemoveFile(ccFile.c_str());
|
cmSystemTools::RemoveFile(ccFile.c_str());
|
||||||
|
|
||||||
// we need to create a directory and CMakeList file etc...
|
// we need to create a directory and CMakeLists file etc...
|
||||||
// first create the directories
|
// first create the directories
|
||||||
sourceDirectory = this->BinaryDirectory.c_str();
|
sourceDirectory = this->BinaryDirectory.c_str();
|
||||||
|
|
||||||
// now create a CMakeList.txt file in that directory
|
// now create a CMakeLists.txt file in that directory
|
||||||
FILE *fout = fopen(outFileName.c_str(),"w");
|
FILE *fout = fopen(outFileName.c_str(),"w");
|
||||||
if (!fout)
|
if (!fout)
|
||||||
{
|
{
|
||||||
|
|
|
@ -70,7 +70,7 @@ bool cmCreateTestSourceList
|
||||||
if (cmSystemTools::GetFilenameExtension(*i).size() < 2)
|
if (cmSystemTools::GetFilenameExtension(*i).size() < 2)
|
||||||
{
|
{
|
||||||
this->SetError(
|
this->SetError(
|
||||||
"You must specify a file extenion for the test driver file.");
|
"You must specify a file extension for the test driver file.");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
std::string driver = this->Makefile->GetCurrentOutputDirectory();
|
std::string driver = this->Makefile->GetCurrentOutputDirectory();
|
||||||
|
|
|
@ -30,7 +30,7 @@
|
||||||
class cmDependsFortranSourceInfo
|
class cmDependsFortranSourceInfo
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
// The name of the soruce file.
|
// The name of the source file.
|
||||||
std::string Source;
|
std::string Source;
|
||||||
|
|
||||||
// Set of provided and required modules.
|
// Set of provided and required modules.
|
||||||
|
@ -810,8 +810,8 @@ bool cmDependsFortran::ModulesDiffer(const char* modFile,
|
||||||
* -GNU
|
* -GNU
|
||||||
* -Intel
|
* -Intel
|
||||||
*
|
*
|
||||||
* Eat the stream content until all recompile only realated changes
|
* Eat the stream content until all recompile only related changes
|
||||||
* are left bedind.
|
* are left behind.
|
||||||
*/
|
*/
|
||||||
if (strcmp(compilerId, "GNU") == 0 )
|
if (strcmp(compilerId, "GNU") == 0 )
|
||||||
{
|
{
|
||||||
|
@ -852,7 +852,7 @@ bool cmDependsFortran::ModulesDiffer(const char* modFile,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Compare the remainng content. If no compiler id matched above,
|
// Compare the remaining content. If no compiler id matched above,
|
||||||
// including the case none was given, this will compare the whole
|
// including the case none was given, this will compare the whole
|
||||||
// content.
|
// content.
|
||||||
if(!cmDependsFortranStreamsDiffer(finModFile, finStampFile))
|
if(!cmDependsFortranStreamsDiffer(finModFile, finStampFile))
|
||||||
|
@ -1209,7 +1209,7 @@ void cmDependsFortranParser_RuleElif(cmDependsFortranParser* parser)
|
||||||
* cmDependsFortranParser_RuleIf(..)
|
* cmDependsFortranParser_RuleIf(..)
|
||||||
*/
|
*/
|
||||||
|
|
||||||
// Allways taken unless an #ifdef or #ifndef-branch has been taken
|
// Always taken unless an #ifdef or #ifndef-branch has been taken
|
||||||
// already. If the second condition isn't meet already
|
// already. If the second condition isn't meet already
|
||||||
// (parser->InPPFalseBranch == 0) correct it.
|
// (parser->InPPFalseBranch == 0) correct it.
|
||||||
if(!parser->SkipToEnd.empty() &&
|
if(!parser->SkipToEnd.empty() &&
|
||||||
|
@ -1228,7 +1228,7 @@ void cmDependsFortranParser_RuleElse(cmDependsFortranParser* parser)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// parser->InPPFalseBranch is either 0 or 1. We change it denpending on
|
// parser->InPPFalseBranch is either 0 or 1. We change it depending on
|
||||||
// parser->SkipToEnd.top()
|
// parser->SkipToEnd.top()
|
||||||
if(!parser->SkipToEnd.empty() &&
|
if(!parser->SkipToEnd.empty() &&
|
||||||
parser->SkipToEnd.top())
|
parser->SkipToEnd.top())
|
||||||
|
|
|
@ -131,7 +131,7 @@ void cmNeedBackwardsCompatibility(const std::string& variable,
|
||||||
" that has not been defined. Some variables were always defined "
|
" that has not been defined. Some variables were always defined "
|
||||||
"by CMake in versions prior to 1.6. To fix this you might need to set "
|
"by CMake in versions prior to 1.6. To fix this you might need to set "
|
||||||
"the cache value of CMAKE_BACKWARDS_COMPATIBILITY to 1.4 or less. If "
|
"the cache value of CMAKE_BACKWARDS_COMPATIBILITY to 1.4 or less. If "
|
||||||
"you are writing a CMakeList file, (or have already set "
|
"you are writing a CMakeLists file, (or have already set "
|
||||||
"CMAKE_BACKWARDS_COMPATABILITY to 1.4 or less) then you probably need "
|
"CMAKE_BACKWARDS_COMPATABILITY to 1.4 or less) then you probably need "
|
||||||
"to include a CMake module to test for the feature this variable "
|
"to include a CMake module to test for the feature this variable "
|
||||||
"defines.";
|
"defines.";
|
||||||
|
@ -1433,7 +1433,7 @@ int cmake::ExecuteCMakeCommand(std::vector<std::string>& args)
|
||||||
// Command to start progress for a build
|
// Command to start progress for a build
|
||||||
else if (args[1] == "cmake_progress_start" && args.size() == 4)
|
else if (args[1] == "cmake_progress_start" && args.size() == 4)
|
||||||
{
|
{
|
||||||
// bascially remove the directory
|
// basically remove the directory
|
||||||
std::string dirName = args[2];
|
std::string dirName = args[2];
|
||||||
dirName += "/Progress";
|
dirName += "/Progress";
|
||||||
cmSystemTools::RemoveADirectory(dirName.c_str());
|
cmSystemTools::RemoveADirectory(dirName.c_str());
|
||||||
|
@ -1930,7 +1930,7 @@ void cmake::SetGlobalGenerator(cmGlobalGenerator *gg)
|
||||||
{
|
{
|
||||||
delete this->GlobalGenerator;
|
delete this->GlobalGenerator;
|
||||||
// restore the original environment variables CXX and CC
|
// restore the original environment variables CXX and CC
|
||||||
// Restor CC
|
// Restore CC
|
||||||
std::string env = "CC=";
|
std::string env = "CC=";
|
||||||
if(this->CCEnvironment.size())
|
if(this->CCEnvironment.size())
|
||||||
{
|
{
|
||||||
|
@ -2608,7 +2608,7 @@ int cmake::LoadCache()
|
||||||
// could we not read the cache
|
// could we not read the cache
|
||||||
if (!this->CacheManager->LoadCache(this->GetHomeOutputDirectory()))
|
if (!this->CacheManager->LoadCache(this->GetHomeOutputDirectory()))
|
||||||
{
|
{
|
||||||
// if it does exist, but isn;t readable then warn the user
|
// if it does exist, but isn't readable then warn the user
|
||||||
std::string cacheFile = this->GetHomeOutputDirectory();
|
std::string cacheFile = this->GetHomeOutputDirectory();
|
||||||
cacheFile += "/CMakeCache.txt";
|
cacheFile += "/CMakeCache.txt";
|
||||||
if(cmSystemTools::FileExists(cacheFile.c_str()))
|
if(cmSystemTools::FileExists(cacheFile.c_str()))
|
||||||
|
@ -3369,19 +3369,21 @@ void cmake::DefineProperties(cmake *cm)
|
||||||
cm->DefineProperty
|
cm->DefineProperty
|
||||||
("ENABLED_FEATURES", cmProperty::GLOBAL,
|
("ENABLED_FEATURES", cmProperty::GLOBAL,
|
||||||
"List of features which are enabled during the CMake run.",
|
"List of features which are enabled during the CMake run.",
|
||||||
"List of features which are enabled during the CMake run. Be default "
|
"List of features which are enabled during the CMake run. By default "
|
||||||
"it contains the names of all packages which were found. This is "
|
"it contains the names of all packages which were found. This is "
|
||||||
"determined using the <NAME>_FOUND variables. Packages which are "
|
"determined using the <NAME>_FOUND variables. Packages which are "
|
||||||
"searched QUIET are not listed. A project can add its own features to "
|
"searched QUIET are not listed. A project can add its own features to "
|
||||||
"this list.This property is used by the macros in FeatureSummary.cmake.");
|
"this list. "
|
||||||
|
"This property is used by the macros in FeatureSummary.cmake.");
|
||||||
cm->DefineProperty
|
cm->DefineProperty
|
||||||
("DISABLED_FEATURES", cmProperty::GLOBAL,
|
("DISABLED_FEATURES", cmProperty::GLOBAL,
|
||||||
"List of features which are disabled during the CMake run.",
|
"List of features which are disabled during the CMake run.",
|
||||||
"List of features which are disabled during the CMake run. Be default "
|
"List of features which are disabled during the CMake run. By default "
|
||||||
"it contains the names of all packages which were not found. This is "
|
"it contains the names of all packages which were not found. This is "
|
||||||
"determined using the <NAME>_FOUND variables. Packages which are "
|
"determined using the <NAME>_FOUND variables. Packages which are "
|
||||||
"searched QUIET are not listed. A project can add its own features to "
|
"searched QUIET are not listed. A project can add its own features to "
|
||||||
"this list.This property is used by the macros in FeatureSummary.cmake.");
|
"this list. "
|
||||||
|
"This property is used by the macros in FeatureSummary.cmake.");
|
||||||
cm->DefineProperty
|
cm->DefineProperty
|
||||||
("PACKAGES_FOUND", cmProperty::GLOBAL,
|
("PACKAGES_FOUND", cmProperty::GLOBAL,
|
||||||
"List of packages which were found during the CMake run.",
|
"List of packages which were found during the CMake run.",
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
|
|
||||||
// This is a wrapper program for xcodebuild
|
// This is a wrapper program for xcodebuild
|
||||||
// it calls xcodebuild, and does two things
|
// it calls xcodebuild, and does two things
|
||||||
// it removes much of the output, all the setevn
|
// it removes much of the output, all the setenv
|
||||||
// stuff. Also, it checks for the text file busy
|
// stuff. Also, it checks for the text file busy
|
||||||
// error, and re-runs xcodebuild until that error does
|
// error, and re-runs xcodebuild until that error does
|
||||||
// not show up.
|
// not show up.
|
||||||
|
|
Loading…
Reference in New Issue