kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

STYLE: Removed trailing whitespace.

This commit is contained in:
Brad King 2007-12-15 14:17:21 -05:00
parent 540a98aa45
commit 994c88559a
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Source/cmFindPackageCommand.cxx
View File

@ -194,7 +194,7 @@ bool cmFindPackageCommand::InitialPass(std::vector<std::string> const& args)
f = "/" + f; f = "/" + f;
f = this->Makefile->GetCurrentDirectory() + f; f = this->Makefile->GetCurrentDirectory() + f;
} }
if(cmSystemTools::FileExists(f.c_str())) if(cmSystemTools::FileExists(f.c_str()))
{ {
if(this->ReadListFile(f.c_str())) if(this->ReadListFile(f.c_str()))
@ -222,11 +222,11 @@ bool cmFindPackageCommand::InitialPass(std::vector<std::string> const& args)
else if(!quiet || required) else if(!quiet || required)
{ {
cmOStringStream e; 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" << ".cmake nor config file " << this->Config << ".\n"
<< "Adjust CMAKE_MODULE_PATH to find Find" << this->Name << "Adjust CMAKE_MODULE_PATH to find Find" << this->Name
<< ".cmake or set " << this->Variable << ".cmake or set " << this->Variable
<< "\nto the directory containing " << this->Config << "\nto the directory containing " << this->Config
<< " in order to use " << this->Name << "."; << " in order to use " << this->Name << ".";
cmSystemTools::Error(e.str().c_str()); cmSystemTools::Error(e.str().c_str());
if(required) if(required)
@ -446,17 +446,17 @@ bool cmFindPackageCommand::ReadListFile(const char* f)
void cmFindPackageCommand::AppendToProperty(const char* propertyName) void cmFindPackageCommand::AppendToProperty(const char* propertyName)
{ {
std::string propertyValue; std::string propertyValue;
const char *prop = const char *prop =
this->Makefile->GetCMakeInstance()->GetProperty(propertyName); this->Makefile->GetCMakeInstance()->GetProperty(propertyName);
if (prop && *prop) if (prop && *prop)
{ {
propertyValue = prop; propertyValue = prop;
std::vector<std::string> contents; std::vector<std::string> contents;
cmSystemTools::ExpandListArgument(propertyValue, contents, false); cmSystemTools::ExpandListArgument(propertyValue, contents, false);
bool alreadyInserted = false; bool alreadyInserted = false;
for(std::vector<std::string>::const_iterator it = contents.begin(); for(std::vector<std::string>::const_iterator it = contents.begin();
it != contents.end(); ++ it ) it != contents.end(); ++ it )
{ {
if (*it == this->Name) if (*it == this->Name)
@ -475,7 +475,7 @@ void cmFindPackageCommand::AppendToProperty(const char* propertyName)
{ {
propertyValue = this->Name; propertyValue = this->Name;
} }
this->Makefile->GetCMakeInstance()->SetProperty(propertyName, this->Makefile->GetCMakeInstance()->SetProperty(propertyName,
propertyValue.c_str()); propertyValue.c_str());
} }

10
Source/cmFindPackageCommand.h
View File

@ -9,8 +9,8 @@
Copyright (c) 2002 Kitware, Inc., Insight Consortium. All rights reserved. Copyright (c) 2002 Kitware, Inc., Insight Consortium. All rights reserved.
See Copyright.txt or http://www.cmake.org/HTML/Copyright.html for details. See Copyright.txt or http://www.cmake.org/HTML/Copyright.html for details.
This software is distributed WITHOUT ANY WARRANTY; without even This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE. See the above copyright notices for more information. PURPOSE. See the above copyright notices for more information.
=========================================================================*/ =========================================================================*/
@ -30,7 +30,7 @@ public:
/** /**
* This is a virtual constructor for the command. * This is a virtual constructor for the command.
*/ */
virtual cmCommand* Clone() virtual cmCommand* Clone()
{ {
return new cmFindPackageCommand; return new cmFindPackageCommand;
} }
@ -54,7 +54,7 @@ public:
/** /**
* Succinct documentation. * Succinct documentation.
*/ */
virtual const char* GetTerseDocumentation() virtual const char* GetTerseDocumentation()
{ {
return "Load settings for an external project."; return "Load settings for an external project.";
} }
@ -90,7 +90,7 @@ public:
"REQUIRED option, or after the COMPONENTS option if no REQUIRED " "REQUIRED option, or after the COMPONENTS option if no REQUIRED "
"option is given."; "option is given.";
} }
cmTypeMacro(cmFindPackageCommand, cmCommand); cmTypeMacro(cmFindPackageCommand, cmCommand);
private: private:
void AppendSuccessInformation(bool quiet); void AppendSuccessInformation(bool quiet);