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

STYLE: fix some line lengths

Browse Source
This commit is contained in:
Ken Martin 2008-03-01 15:26:15 -05:00
parent d49ef18f8a
commit bd0447be7d
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Source/cmPolicies.cxx
View File

@ -186,7 +186,8 @@ 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::map<cmPolicies::PolicyID,cmPolicy *>::iterator i = this->Policies.begin(); std::map<cmPolicies::PolicyID,cmPolicy *>::iterator i
= this->Policies.begin();
for (;i != this->Policies.end(); ++i) for (;i != this->Policies.end(); ++i)
{ {
if (i->second->IsPolicyNewerThan(majorVer,minorVer,patchVer)) if (i->second->IsPolicyNewerThan(majorVer,minorVer,patchVer))
@ -211,8 +212,8 @@ bool cmPolicies::ApplyPolicyVersion(cmMakefile *mf,
bool cmPolicies::IsValidPolicyStatus(cmPolicies::PolicyID id, bool cmPolicies::IsValidPolicyStatus(cmPolicies::PolicyID id,
cmPolicies::PolicyStatus status) cmPolicies::PolicyStatus status)
{ {
// if they are setting a feature to anything other than OLD or WARN and the feature is not known about // if they are setting a feature to anything other than OLD or WARN and the
// then that is an error // feature is not known about then that is an error
if (this->Policies.find(id) == this->Policies.end()) if (this->Policies.find(id) == this->Policies.end())
{ {
if (status == cmPolicies::WARN || if (status == cmPolicies::WARN ||
@ -230,8 +231,8 @@ bool cmPolicies::IsValidPolicyStatus(cmPolicies::PolicyID id,
return false; return false;
} }
// now we know the feature is defined, so the only issue is if someone is setting it to // now we know the feature is defined, so the only issue is if someone is
// WARN or OLD when the feature is REQUIRED_ALWAYS // setting it to WARN or OLD when the feature is REQUIRED_ALWAYS
if ((status == cmPolicies::WARN || if ((status == cmPolicies::WARN ||
status == cmPolicies::OLD) && status == cmPolicies::OLD) &&
this->Policies[id]->Status == cmPolicies::REQUIRED_ALWAYS) this->Policies[id]->Status == cmPolicies::REQUIRED_ALWAYS)
@ -260,8 +261,8 @@ bool cmPolicies::IsValidPolicyStatus(cmPolicies::PolicyID id,
bool cmPolicies::IsValidUsedPolicyStatus(cmPolicies::PolicyID id, bool cmPolicies::IsValidUsedPolicyStatus(cmPolicies::PolicyID id,
cmPolicies::PolicyStatus status) cmPolicies::PolicyStatus status)
{ {
// if they are setting a feature to anything other than OLD or WARN and the feature is not known about // if they are setting a feature to anything other than OLD or WARN and the
// then that is an error // feature is not known about then that is an error
if (this->Policies.find(id) == this->Policies.end()) if (this->Policies.find(id) == this->Policies.end())
{ {
if (status == cmPolicies::WARN || if (status == cmPolicies::WARN ||
@ -279,8 +280,8 @@ bool cmPolicies::IsValidUsedPolicyStatus(cmPolicies::PolicyID id,
return false; return false;
} }
// now we know the feature is defined, so the only issue is if someone is setting it to // now we know the feature is defined, so the only issue is if someone is
// WARN or OLD when the feature is REQUIRED_ALWAYS // setting it to WARN or OLD when the feature is REQUIRED_ALWAYS
if ((status == cmPolicies::WARN || if ((status == cmPolicies::WARN ||
status == cmPolicies::OLD) && status == cmPolicies::OLD) &&
(this->Policies[id]->Status == cmPolicies::REQUIRED_ALWAYS || (this->Policies[id]->Status == cmPolicies::REQUIRED_ALWAYS ||

3
Source/cmPolicies.h
View File

@ -26,7 +26,8 @@ class cmPolicy;
/** \class cmPolicies /** \class cmPolicies
* \brief Handles changes in CMake behavior and policies * \brief Handles changes in CMake behavior and policies
* *
* See the cmake wiki section on policies for an overview of this class's purpose * See the cmake wiki section on policies for an overview of this class's
* purpose
*/ */
class cmPolicies class cmPolicies
{ {