diff options
author | Brad King <brad.king@kitware.com> | 2011-01-11 20:51:54 (GMT) |
---|---|---|
committer | CMake Topic Stage <kwrobot@kitware.com> | 2011-01-11 20:51:54 (GMT) |
commit | 4ab987b7ccc62abab700cb02b75460cf2a6f7862 (patch) | |
tree | 70d48bfc704812babf47f10270c914d6958b198c /Source | |
parent | 13cc4bb628045ca8226e78081068eae09479713a (diff) | |
parent | 75a522110d3e142d4c549a072aa3b1b8792cd865 (diff) | |
download | CMake-4ab987b7ccc62abab700cb02b75460cf2a6f7862.zip CMake-4ab987b7ccc62abab700cb02b75460cf2a6f7862.tar.gz CMake-4ab987b7ccc62abab700cb02b75460cf2a6f7862.tar.bz2 |
Merge topic 'include-command-whitespace'
75a5221 Remove trailing whitespace
Diffstat (limited to 'Source')
-rw-r--r-- | Source/cmIncludeCommand.cxx | 16 | ||||
-rw-r--r-- | Source/cmIncludeCommand.h | 12 |
2 files changed, 14 insertions, 14 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"); } diff --git a/Source/cmIncludeCommand.h b/Source/cmIncludeCommand.h index a215275..8704750 100644 --- a/Source/cmIncludeCommand.h +++ b/Source/cmIncludeCommand.h @@ -15,7 +15,7 @@ #include "cmCommand.h" /** \class cmIncludeCommand - * \brief + * \brief * * cmIncludeCommand defines a list of distant * files that can be "included" in the current list file. @@ -28,7 +28,7 @@ public: /** * This is a virtual constructor for the command. */ - virtual cmCommand* Clone() + virtual cmCommand* Clone() { return new cmIncludeCommand; } @@ -49,15 +49,15 @@ public: * The name of the command as specified in CMakeList.txt. */ virtual const char* GetName() {return "include";} - + /** * Succinct documentation. */ - virtual const char* GetTerseDocumentation() + virtual const char* GetTerseDocumentation() { return "Read CMake listfile code from the given file."; } - + /** * More documentation. */ @@ -79,7 +79,7 @@ public: "NO_POLICY_SCOPE option." ; } - + cmTypeMacro(cmIncludeCommand, cmCommand); }; |