diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx index 1f534a504..96afe175a 100644 --- a/Source/cmFindPackageCommand.cxx +++ b/Source/cmFindPackageCommand.cxx @@ -194,7 +194,7 @@ bool cmFindPackageCommand::InitialPass(std::vector const& args) f = "/" + f; f = this->Makefile->GetCurrentDirectory() + f; } - + if(cmSystemTools::FileExists(f.c_str())) { if(this->ReadListFile(f.c_str())) @@ -222,11 +222,11 @@ bool cmFindPackageCommand::InitialPass(std::vector const& args) else if(!quiet || required) { cmOStringStream e; - e << "FIND_PACKAGE could not find Find" << this->Name + e << "FIND_PACKAGE could not find Find" << this->Name << ".cmake nor config file " << this->Config << ".\n" - << "Adjust CMAKE_MODULE_PATH to find Find" << this->Name - << ".cmake or set " << this->Variable - << "\nto the directory containing " << this->Config + << "Adjust CMAKE_MODULE_PATH to find Find" << this->Name + << ".cmake or set " << this->Variable + << "\nto the directory containing " << this->Config << " in order to use " << this->Name << "."; cmSystemTools::Error(e.str().c_str()); if(required) @@ -446,17 +446,17 @@ bool cmFindPackageCommand::ReadListFile(const char* f) void cmFindPackageCommand::AppendToProperty(const char* propertyName) { std::string propertyValue; - const char *prop = + const char *prop = this->Makefile->GetCMakeInstance()->GetProperty(propertyName); if (prop && *prop) { propertyValue = prop; - + std::vector contents; cmSystemTools::ExpandListArgument(propertyValue, contents, false); - + bool alreadyInserted = false; - for(std::vector::const_iterator it = contents.begin(); + for(std::vector::const_iterator it = contents.begin(); it != contents.end(); ++ it ) { if (*it == this->Name) @@ -475,7 +475,7 @@ void cmFindPackageCommand::AppendToProperty(const char* propertyName) { propertyValue = this->Name; } - this->Makefile->GetCMakeInstance()->SetProperty(propertyName, + this->Makefile->GetCMakeInstance()->SetProperty(propertyName, propertyValue.c_str()); } diff --git a/Source/cmFindPackageCommand.h b/Source/cmFindPackageCommand.h index ae04f6c2c..26c609075 100644 --- a/Source/cmFindPackageCommand.h +++ b/Source/cmFindPackageCommand.h @@ -9,8 +9,8 @@ Copyright (c) 2002 Kitware, Inc., Insight Consortium. All rights reserved. See Copyright.txt or http://www.cmake.org/HTML/Copyright.html for details. - This software is distributed WITHOUT ANY WARRANTY; without even - the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + This software is distributed WITHOUT ANY WARRANTY; without even + the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the above copyright notices for more information. =========================================================================*/ @@ -30,7 +30,7 @@ public: /** * This is a virtual constructor for the command. */ - virtual cmCommand* Clone() + virtual cmCommand* Clone() { return new cmFindPackageCommand; } @@ -54,7 +54,7 @@ public: /** * Succinct documentation. */ - virtual const char* GetTerseDocumentation() + virtual const char* GetTerseDocumentation() { return "Load settings for an external project."; } @@ -90,7 +90,7 @@ public: "REQUIRED option, or after the COMPONENTS option if no REQUIRED " "option is given."; } - + cmTypeMacro(cmFindPackageCommand, cmCommand); private: void AppendSuccessInformation(bool quiet);