diff options
author | Alex Neundorf <neundorf@kde.org> | 2010-12-14 21:25:21 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2011-01-04 12:59:24 (GMT) |
commit | 75a522110d3e142d4c549a072aa3b1b8792cd865 (patch) | |
tree | 5766e0fdca10b766b2c95c6229d0ce4ae0f51af9 /Source/cmIncludeCommand.cxx | |
parent | b541b1213ac4bf95a186d9fa753ba2566e598d06 (diff) | |
download | CMake-75a522110d3e142d4c549a072aa3b1b8792cd865.zip CMake-75a522110d3e142d4c549a072aa3b1b8792cd865.tar.gz CMake-75a522110d3e142d4c549a072aa3b1b8792cd865.tar.bz2 |
Remove trailing whitespace
Diffstat (limited to 'Source/cmIncludeCommand.cxx')
-rw-r--r-- | Source/cmIncludeCommand.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Source/cmIncludeCommand.cxx b/Source/cmIncludeCommand.cxx index c9b14a1..0ac6df4 100644 --- a/Source/cmIncludeCommand.cxx +++ b/Source/cmIncludeCommand.cxx @@ -26,10 +26,10 @@ bool cmIncludeCommand bool noPolicyScope = false; std::string fname = args[0]; std::string resultVarName; - + for (unsigned int i=1; i<args.size(); i++) { - if (args[i] == "OPTIONAL") + if (args[i] == "OPTIONAL") { if (optional) { @@ -60,10 +60,10 @@ bool cmIncludeCommand { noPolicyScope = true; } - else if(i > 1) // compat.: in previous cmake versions the second + else if(i > 1) // compat.: in previous cmake versions the second // parameter was ignore if it wasn't "OPTIONAL" { - std::string errorText = "called with invalid argument: "; + std::string errorText = "called with invalid argument: "; errorText += args[i]; this->SetError(errorText.c_str()); return false; @@ -82,15 +82,15 @@ bool cmIncludeCommand } } std::string fullFilePath; - bool readit = - this->Makefile->ReadListFile( this->Makefile->GetCurrentListFile(), + bool readit = + this->Makefile->ReadListFile( this->Makefile->GetCurrentListFile(), fname.c_str(), &fullFilePath, noPolicyScope); - + // add the location of the included file if a result variable was given if (resultVarName.size()) { - this->Makefile->AddDefinition(resultVarName.c_str(), + this->Makefile->AddDefinition(resultVarName.c_str(), readit?fullFilePath.c_str():"NOTFOUND"); } |