diff options
Diffstat (limited to 'Source/cmVariableRequiresCommand.cxx')
| -rw-r--r-- | Source/cmVariableRequiresCommand.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/cmVariableRequiresCommand.cxx b/Source/cmVariableRequiresCommand.cxx index 0e97a83..747e9be 100644 --- a/Source/cmVariableRequiresCommand.cxx +++ b/Source/cmVariableRequiresCommand.cxx @@ -22,7 +22,7 @@ bool cmVariableRequiresCommand return false; } - std::string testVariable = args[0]; + std::string testVariable = args[0]; if(!this->Makefile->IsOn(testVariable.c_str())) { return true; @@ -38,7 +38,7 @@ bool cmVariableRequiresCommand requirementsMet = false; notSet += args[i]; notSet += "\n"; - cmCacheManager::CacheIterator it = + cmCacheManager::CacheIterator it = this->Makefile->GetCacheManager()->GetCacheIterator(args[i].c_str()); if(!it.IsAtEnd() && it.GetPropertyAsBool("ADVANCED")) { @@ -47,7 +47,7 @@ bool cmVariableRequiresCommand } } const char* reqVar = this->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 // set reqVar to false. if(!reqVar || (!requirementsMet && this->Makefile->IsOn(reqVar))) @@ -58,14 +58,14 @@ bool cmVariableRequiresCommand if(!requirementsMet) { std::string message = "Variable assertion failed:\n"; - message += testVariable + + message += testVariable + " Requires that the following unset variables are set:\n"; message += notSet; message += "\nPlease set them, or set "; message += testVariable + " to false, and re-configure.\n"; if(hasAdvanced) { - message += + message += "One or more of the required variables is advanced." " To set the variable, you must turn on advanced mode in cmake."; } |