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

Remove trailing whitespace 

Alex
This commit is contained in:
Alex Neundorf 2010-08-28 16:01:49 +02:00
parent 6aef6d84d7
commit da033b10d2
2 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
Source/cmPolicies.cxx
View File

@ -15,8 +15,8 @@ const char* cmPolicies::PolicyStatusNames[] = {
class cmPolicy class cmPolicy
{ {
public: public:
cmPolicy(cmPolicies::PolicyID iD, cmPolicy(cmPolicies::PolicyID iD,
const char *idString, const char *idString,
const char *shortDescription, const char *shortDescription,
const char *longDescription, const char *longDescription,
@ -55,7 +55,7 @@ public:
return v.str(); return v.str();
} }
bool IsPolicyNewerThan(unsigned int majorV, bool IsPolicyNewerThan(unsigned int majorV,
unsigned int minorV, unsigned int minorV,
unsigned int patchV, unsigned int patchV,
unsigned int tweakV) unsigned int tweakV)
@ -86,7 +86,7 @@ public:
} }
return (tweakV < this->TweakVersionIntroduced); return (tweakV < this->TweakVersionIntroduced);
} }
cmPolicies::PolicyID ID; cmPolicies::PolicyID ID;
std::string IDString; std::string IDString;
std::string ShortDescription; std::string ShortDescription;
@ -285,12 +285,12 @@ cmPolicies::cmPolicies()
"The NEW behavior for this policy is to produce an error if a bundle " "The NEW behavior for this policy is to produce an error if a bundle "
"target is installed without a BUNDLE DESTINATION.", "target is installed without a BUNDLE DESTINATION.",
2,6,0,0, cmPolicies::WARN); 2,6,0,0, cmPolicies::WARN);
this->DefinePolicy( this->DefinePolicy(
CMP0007, "CMP0007", CMP0007, "CMP0007",
"list command no longer ignores empty elements.", "list command no longer ignores empty elements.",
"This policy determines whether the list command will " "This policy determines whether the list command will "
"ignore empty elements in the list. " "ignore empty elements in the list. "
"CMake 2.4 and below list commands ignored all empty elements" "CMake 2.4 and below list commands ignored all empty elements"
" in the list. For example, a;b;;c would have length 3 and not 4. " " in the list. For example, a;b;;c would have length 3 and not 4. "
"The OLD behavior for this policy is to ignore empty list elements. " "The OLD behavior for this policy is to ignore empty list elements. "
@ -426,7 +426,7 @@ cmPolicies::cmPolicies()
this->DefinePolicy( this->DefinePolicy(
CMP0015, "CMP0015", CMP0015, "CMP0015",
"link_directories() treats paths relative to the source dir.", "link_directories() treats paths relative to the source dir.",
"In CMake 2.6.4 and lower the link_directories() command passed relative " "In CMake 2.8.0 and lower the link_directories() command passed relative "
"paths unchanged to the linker. " "paths unchanged to the linker. "
"In CMake 2.8.1 and above the link_directories() command prefers to " "In CMake 2.8.1 and above the link_directories() command prefers to "
"interpret relative paths with respect to CMAKE_CURRENT_SOURCE_DIR, " "interpret relative paths with respect to CMAKE_CURRENT_SOURCE_DIR, "
@ -437,12 +437,13 @@ cmPolicies::cmPolicies()
"absolute paths by appending the relative path to " "absolute paths by appending the relative path to "
"CMAKE_CURRENT_SOURCE_DIR.", "CMAKE_CURRENT_SOURCE_DIR.",
2,8,1,0, cmPolicies::WARN); 2,8,1,0, cmPolicies::WARN);
} }
cmPolicies::~cmPolicies() cmPolicies::~cmPolicies()
{ {
// free the policies // free the policies
std::map<cmPolicies::PolicyID,cmPolicy *>::iterator i std::map<cmPolicies::PolicyID,cmPolicy *>::iterator i
= this->Policies.begin(); = this->Policies.begin();
for (;i != this->Policies.end(); ++i) for (;i != this->Policies.end(); ++i)
{ {
@ -451,7 +452,7 @@ cmPolicies::~cmPolicies()
} }
void cmPolicies::DefinePolicy(cmPolicies::PolicyID iD, void cmPolicies::DefinePolicy(cmPolicies::PolicyID iD,
const char *idString, const char *idString,
const char *shortDescription, const char *shortDescription,
const char *longDescription, const char *longDescription,
unsigned int majorVersionIntroduced, unsigned int majorVersionIntroduced,
@ -467,7 +468,7 @@ void cmPolicies::DefinePolicy(cmPolicies::PolicyID iD,
"ID ", this->GetPolicyIDString(iD).c_str()); "ID ", this->GetPolicyIDString(iD).c_str());
return; return;
} }
this->Policies[iD] = new cmPolicy(iD, idString, this->Policies[iD] = new cmPolicy(iD, idString,
shortDescription, shortDescription,
longDescription, longDescription,
@ -480,7 +481,7 @@ void cmPolicies::DefinePolicy(cmPolicies::PolicyID iD,
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
bool cmPolicies::ApplyPolicyVersion(cmMakefile *mf, bool cmPolicies::ApplyPolicyVersion(cmMakefile *mf,
const char *version) const char *version)
{ {
std::string ver = "2.4.0"; std::string ver = "2.4.0";
@ -505,7 +506,7 @@ bool cmPolicies::ApplyPolicyVersion(cmMakefile *mf,
mf->IssueMessage(cmake::FATAL_ERROR, e.str()); mf->IssueMessage(cmake::FATAL_ERROR, e.str());
return false; return false;
} }
// it is an error if the policy version is less than 2.4 // it is an error if the policy version is less than 2.4
if (majorVer < 2 || (majorVer == 2 && minorVer < 4)) if (majorVer < 2 || (majorVer == 2 && minorVer < 4))
{ {
@ -547,7 +548,7 @@ bool cmPolicies::ApplyPolicyVersion(cmMakefile *mf,
// now loop over all the policies and set them as appropriate // now loop over all the policies and set them as appropriate
std::vector<cmPolicies::PolicyID> ancientPolicies; std::vector<cmPolicies::PolicyID> ancientPolicies;
std::map<cmPolicies::PolicyID,cmPolicy *>::iterator i std::map<cmPolicies::PolicyID,cmPolicy *>::iterator i
= this->Policies.begin(); = this->Policies.begin();
for (;i != this->Policies.end(); ++i) for (;i != this->Policies.end(); ++i)
{ {
@ -589,7 +590,7 @@ bool cmPolicies::GetPolicyID(const char *id, cmPolicies::PolicyID &pid)
{ {
return false; return false;
} }
std::map<std::string,cmPolicies::PolicyID>::iterator pos = std::map<std::string,cmPolicies::PolicyID>::iterator pos =
this->PolicyStringMap.find(id); this->PolicyStringMap.find(id);
if (pos == this->PolicyStringMap.end()) if (pos == this->PolicyStringMap.end())
{ {
@ -601,7 +602,7 @@ bool cmPolicies::GetPolicyID(const char *id, cmPolicies::PolicyID &pid)
std::string cmPolicies::GetPolicyIDString(cmPolicies::PolicyID pid) std::string cmPolicies::GetPolicyIDString(cmPolicies::PolicyID pid)
{ {
std::map<cmPolicies::PolicyID,cmPolicy *>::iterator pos = std::map<cmPolicies::PolicyID,cmPolicy *>::iterator pos =
this->Policies.find(pid); this->Policies.find(pid);
if (pos == this->Policies.end()) if (pos == this->Policies.end())
{ {
@ -614,7 +615,7 @@ std::string cmPolicies::GetPolicyIDString(cmPolicies::PolicyID pid)
///! return a warning string for a given policy ///! return a warning string for a given policy
std::string cmPolicies::GetPolicyWarning(cmPolicies::PolicyID id) std::string cmPolicies::GetPolicyWarning(cmPolicies::PolicyID id)
{ {
std::map<cmPolicies::PolicyID,cmPolicy *>::iterator pos = std::map<cmPolicies::PolicyID,cmPolicy *>::iterator pos =
this->Policies.find(id); this->Policies.find(id);
if (pos == this->Policies.end()) if (pos == this->Policies.end())
{ {
@ -633,12 +634,12 @@ std::string cmPolicies::GetPolicyWarning(cmPolicies::PolicyID id)
"and suppress this warning."; "and suppress this warning.";
return msg.str(); return msg.str();
} }
///! return an error string for when a required policy is unspecified ///! return an error string for when a required policy is unspecified
std::string cmPolicies::GetRequiredPolicyError(cmPolicies::PolicyID id) std::string cmPolicies::GetRequiredPolicyError(cmPolicies::PolicyID id)
{ {
std::map<cmPolicies::PolicyID,cmPolicy *>::iterator pos = std::map<cmPolicies::PolicyID,cmPolicy *>::iterator pos =
this->Policies.find(id); this->Policies.find(id);
if (pos == this->Policies.end()) if (pos == this->Policies.end())
{ {
@ -664,25 +665,25 @@ std::string cmPolicies::GetRequiredPolicyError(cmPolicies::PolicyID id)
} }
///! Get the default status for a policy ///! Get the default status for a policy
cmPolicies::PolicyStatus cmPolicies::PolicyStatus
cmPolicies::GetPolicyStatus(cmPolicies::PolicyID id) cmPolicies::GetPolicyStatus(cmPolicies::PolicyID id)
{ {
// if the policy is not know then what? // if the policy is not know then what?
std::map<cmPolicies::PolicyID,cmPolicy *>::iterator pos = std::map<cmPolicies::PolicyID,cmPolicy *>::iterator pos =
this->Policies.find(id); this->Policies.find(id);
if (pos == this->Policies.end()) if (pos == this->Policies.end())
{ {
// TODO is this right? // TODO is this right?
return cmPolicies::WARN; return cmPolicies::WARN;
} }
return pos->second->Status; return pos->second->Status;
} }
void cmPolicies::GetDocumentation(std::vector<cmDocumentationEntry>& v) void cmPolicies::GetDocumentation(std::vector<cmDocumentationEntry>& v)
{ {
// now loop over all the policies and set them as appropriate // now loop over all the policies and set them as appropriate
std::map<cmPolicies::PolicyID,cmPolicy *>::iterator i std::map<cmPolicies::PolicyID,cmPolicy *>::iterator i
= this->Policies.begin(); = this->Policies.begin();
for (;i != this->Policies.end(); ++i) for (;i != this->Policies.end(); ++i)
{ {

6
Source/cmPolicies.h
View File

@ -60,10 +60,10 @@ public:
///! convert a string policy ID into a number ///! convert a string policy ID into a number
bool GetPolicyID(const char *id, /* out */ cmPolicies::PolicyID &pid); bool GetPolicyID(const char *id, /* out */ cmPolicies::PolicyID &pid);
std::string GetPolicyIDString(cmPolicies::PolicyID pid); std::string GetPolicyIDString(cmPolicies::PolicyID pid);
///! Get the default status for a policy ///! Get the default status for a policy
cmPolicies::PolicyStatus GetPolicyStatus(cmPolicies::PolicyID id); cmPolicies::PolicyStatus GetPolicyStatus(cmPolicies::PolicyID id);
///! Define a Policy for CMake ///! Define a Policy for CMake
void DefinePolicy(cmPolicies::PolicyID id, void DefinePolicy(cmPolicies::PolicyID id,
const char *stringID, const char *stringID,
@ -80,7 +80,7 @@ public:
///! return a warning string for a given policy ///! return a warning string for a given policy
std::string GetPolicyWarning(cmPolicies::PolicyID id); std::string GetPolicyWarning(cmPolicies::PolicyID id);
///! return an error string for when a required policy is unspecified ///! return an error string for when a required policy is unspecified
std::string GetRequiredPolicyError(cmPolicies::PolicyID id); std::string GetRequiredPolicyError(cmPolicies::PolicyID id);