spelling errors

This commit is contained in:
Bill Hoffman 2003-02-14 09:54:15 -05:00
parent a410fdef60
commit ae5a80c795
11 changed files with 22 additions and 22 deletions

View File

@ -4,7 +4,7 @@
# CMAKE_NO_STD_NAMESPACE - defined accoreding to the results # CMAKE_NO_STD_NAMESPACE - defined accoreding to the results
# #
IF("CMAKE_ANSI_FOR_SCOPE" MATCHES "^CMAKE_ANSI_FOR_SCOPE$") #IF("CMAKE_ANSI_FOR_SCOPE" MATCHES "^CMAKE_ANSI_FOR_SCOPE$")
MESSAGE(STATUS "Check for ANSI scope") MESSAGE(STATUS "Check for ANSI scope")
TRY_COMPILE(CMAKE_ANSI_FOR_SCOPE ${CMAKE_BINARY_DIR} TRY_COMPILE(CMAKE_ANSI_FOR_SCOPE ${CMAKE_BINARY_DIR}
${CMAKE_ROOT}/Modules/TestForAnsiForScope.cxx) ${CMAKE_ROOT}/Modules/TestForAnsiForScope.cxx)
@ -17,7 +17,7 @@ IF("CMAKE_ANSI_FOR_SCOPE" MATCHES "^CMAKE_ANSI_FOR_SCOPE$")
SET (CMAKE_NO_ANSI_FOR_SCOPE 1 CACHE INTERNAL SET (CMAKE_NO_ANSI_FOR_SCOPE 1 CACHE INTERNAL
"Does the compiler support ansi for scope.") "Does the compiler support ansi for scope.")
ENDIF (CMAKE_ANSI_FOR_SCOPE) ENDIF (CMAKE_ANSI_FOR_SCOPE)
ENDIF("CMAKE_ANSI_FOR_SCOPE" MATCHES "^CMAKE_ANSI_FOR_SCOPE$") #ENDIF("CMAKE_ANSI_FOR_SCOPE" MATCHES "^CMAKE_ANSI_FOR_SCOPE$")

View File

@ -303,7 +303,7 @@ bool cmCacheManager::SaveCache(const char* path)
<< "# If you do want to change a value, simply edit, save, and exit the editor.\n" << "# If you do want to change a value, simply edit, save, and exit the editor.\n"
<< "# The syntax for the file is as follows:\n" << "# The syntax for the file is as follows:\n"
<< "# KEY:TYPE=VALUE\n" << "# KEY:TYPE=VALUE\n"
<< "# KEY is the name of a varible in the cache.\n" << "# KEY is the name of a variable in the cache.\n"
<< "# TYPE is a hint to GUI's for the type of VALUE, DO NOT EDIT TYPE!.\n" << "# TYPE is a hint to GUI's for the type of VALUE, DO NOT EDIT TYPE!.\n"
<< "# VALUE is the current value for the KEY.\n\n"; << "# VALUE is the current value for the KEY.\n\n";

View File

@ -103,7 +103,7 @@ void cmConfigureFileCommand::ConfigureFile()
return; return;
} }
// now copy input to output and expand varibles in the // now copy input to output and expand variables in the
// input file at the same time // input file at the same time
const int bufSize = 4096; const int bufSize = 4096;
char buffer[bufSize]; char buffer[bufSize];

View File

@ -59,7 +59,7 @@ public:
"This command replaces any variables in the input file with their " "This command replaces any variables in the input file with their "
"values as determined by CMake. If a variables in not defined, it " "values as determined by CMake. If a variables in not defined, it "
"will be replaced with nothing. If COPYONLY is passed in, then " "will be replaced with nothing. If COPYONLY is passed in, then "
"then no varible expansion will take place. If ESCAPE_QUOTES is " "then no variable expansion will take place. If ESCAPE_QUOTES is "
"passed in then any substitued quotes will be C style escaped. " "passed in then any substitued quotes will be C style escaped. "
"If IMMEDIATE is specified, then the file will be configured with " "If IMMEDIATE is specified, then the file will be configured with "
"the current values of CMake variables instead of waiting until the " "the current values of CMake variables instead of waiting until the "

View File

@ -61,7 +61,7 @@ public:
*/ */
virtual const char* GetTerseDocumentation() virtual const char* GetTerseDocumentation()
{ {
return "Basically identical to a C #include \"somthing\" command."; return "Basically identical to a C #include \"something\" command.";
} }
/** /**

View File

@ -2737,13 +2737,13 @@ cmLocalUnixMakefileGenerator::CreateMakeVariable(const char* s, const char* s2)
} }
if(ni == 1000) if(ni == 1000)
{ {
cmSystemTools::Error("Borland makefile varible length too long"); cmSystemTools::Error("Borland makefile variable length too long");
return unmodified; return unmodified;
} }
// once an unused variable is found // once an unused variable is found
m_ShortMakeVariableMap[ret] = "1"; m_ShortMakeVariableMap[ret] = "1";
} }
// always make an entry into the unmodified to varible map // always make an entry into the unmodified to variable map
m_MakeVariableMap[unmodified] = ret; m_MakeVariableMap[unmodified] = ret;
return ret; return ret;

View File

@ -481,8 +481,8 @@ public:
{ m_ListFiles.push_back(file);} { m_ListFiles.push_back(file);}
/** /**
* Expand all defined varibles in the string. * Expand all defined variables in the string.
* Defined varibles come from the m_Definitions map. * Defined variables come from the m_Definitions map.
* They are expanded with ${var} where var is the * They are expanded with ${var} where var is the
* entry in the m_Definitions map. Also @var@ is * entry in the m_Definitions map. Also @var@ is
* expanded to match autoconf style expansions. * expanded to match autoconf style expansions.

View File

@ -58,7 +58,7 @@ public:
*/ */
virtual const char* GetTerseDocumentation() virtual const char* GetTerseDocumentation()
{ {
return "Mark a cmake varible as advanced."; return "Mark a cmake variable as advanced.";
} }
/** /**

View File

@ -87,7 +87,7 @@ CopyAndFullPathMesaHeader(const char* source,
source); source);
return; return;
} }
// now copy input to output and expand varibles in the // now copy input to output and expand variables in the
// input file at the same time // input file at the same time
const int bufSize = 4096; const int bufSize = 4096;
char buffer[bufSize]; char buffer[bufSize];

View File

@ -31,12 +31,12 @@ bool cmVariableRequiresCommand::InitialPass(std::vector<std::string> const& args
void cmVariableRequiresCommand::FinalPass() void cmVariableRequiresCommand::FinalPass()
{ {
std::string testVarible = m_Arguments[0]; std::string testVariable = m_Arguments[0];
if(!m_Makefile->IsOn(testVarible.c_str())) if(!m_Makefile->IsOn(testVariable.c_str()))
{ {
return; return;
} }
std::string resultVarible = m_Arguments[1]; std::string resultVariable = m_Arguments[1];
bool requirementsMet = true; bool requirementsMet = true;
std::string notSet; std::string notSet;
bool hasAdvanced = false; bool hasAdvanced = false;
@ -55,22 +55,22 @@ void cmVariableRequiresCommand::FinalPass()
} }
} }
} }
const char* reqVar = m_Makefile->GetDefinition(resultVarible.c_str()); const char* reqVar = m_Makefile->GetDefinition(resultVariable.c_str());
// if reqVar is unset, then set it to requirementsMet // if reqVar is unset, then set it to requirementsMet
// if reqVar is set to true, but requirementsMet is false , then // if reqVar is set to true, but requirementsMet is false , then
// set reqVar to false. // set reqVar to false.
if(!reqVar || (!requirementsMet && m_Makefile->IsOn(reqVar))) if(!reqVar || (!requirementsMet && m_Makefile->IsOn(reqVar)))
{ {
m_Makefile->AddDefinition(resultVarible.c_str(), requirementsMet); m_Makefile->AddDefinition(resultVariable.c_str(), requirementsMet);
} }
if(!requirementsMet) if(!requirementsMet)
{ {
std::string message = "Variable assertion failed:\n"; std::string message = "Variable assertion failed:\n";
message += testVarible + " Requires that the following unset varibles are set:\n"; message += testVariable + " Requires that the following unset variables are set:\n";
message += notSet; message += notSet;
message += "\nPlease set them, or set "; message += "\nPlease set them, or set ";
message += testVarible + " to false, and re-configure.\n"; message += testVariable + " to false, and re-configure.\n";
if(hasAdvanced) if(hasAdvanced)
{ {
message += "One or more of the required variables is advanced. To set the variable, you must turn on advanced mode in cmake."; message += "One or more of the required variables is advanced. To set the variable, you must turn on advanced mode in cmake.";

View File

@ -64,13 +64,13 @@ public:
return return
"VARIABLE_REQUIRES(TEST_VARIABLE RESULT_VARIABLE " "VARIABLE_REQUIRES(TEST_VARIABLE RESULT_VARIABLE "
"REQUIRED_VARIABLE1 REQUIRED_VARIABLE2 ...) " "REQUIRED_VARIABLE1 REQUIRED_VARIABLE2 ...) "
"The first argument (TEST_VARIABLE) is the name of the varible to be " "The first argument (TEST_VARIABLE) is the name of the variable to be "
"tested, if that varible is false nothing else is done. If " "tested, if that variable is false nothing else is done. If "
"TEST_VARIABLE is true, then " "TEST_VARIABLE is true, then "
"the next arguemnt (RESULT_VARIABLE) is a vairable that is set to true " "the next arguemnt (RESULT_VARIABLE) is a vairable that is set to true "
"if all the " "if all the "
"required variables are set." "required variables are set."
"The rest of the arguments are varibles that must be true or not " "The rest of the arguments are variables that must be true or not "
"set to NOTFOUND to avoid an error. "; "set to NOTFOUND to avoid an error. ";
} }