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

cmLocalGenerator: Add GetPolicyStatus API

Browse Source
This commit is contained in:
Stephen Kelly 2015-10-23 01:13:36 +02:00
parent 7a1b83cb3f
commit 7d409f500e
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/cmGeneratorExpressionNode.cxx
View File

@ -393,7 +393,7 @@ struct CompilerIdNode : public cmGeneratorExpressionNode
if (cmsysString_strcasecmp(parameters.begin()->c_str(), compilerId) == 0) if (cmsysString_strcasecmp(parameters.begin()->c_str(), compilerId) == 0)
{ {
switch(context->LG->GetMakefile()->GetPolicyStatus(cmPolicies::CMP0044)) switch(context->LG->GetPolicyStatus(cmPolicies::CMP0044))
{ {
case cmPolicies::WARN: case cmPolicies::WARN:
{ {
@ -1100,7 +1100,7 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
"COMPILE_DEFINITIONS_")) "COMPILE_DEFINITIONS_"))
{ {
cmPolicies::PolicyStatus polSt = cmPolicies::PolicyStatus polSt =
context->LG->GetMakefile()->GetPolicyStatus(cmPolicies::CMP0043); context->LG->GetPolicyStatus(cmPolicies::CMP0043);
if (polSt == cmPolicies::WARN || polSt == cmPolicies::OLD) if (polSt == cmPolicies::WARN || polSt == cmPolicies::OLD)
{ {
interfacePropertyName = "INTERFACE_COMPILE_DEFINITIONS"; interfacePropertyName = "INTERFACE_COMPILE_DEFINITIONS";

10
Source/cmLocalGenerator.cxx
View File

@ -2201,7 +2201,7 @@ bool cmLocalGenerator::GetShouldUseOldFlags(bool shared,
if (flags && flags != originalFlags) if (flags && flags != originalFlags)
{ {
switch (this->Makefile->GetPolicyStatus(cmPolicies::CMP0018)) switch (this->GetPolicyStatus(cmPolicies::CMP0018))
{ {
case cmPolicies::WARN: case cmPolicies::WARN:
{ {
@ -2949,7 +2949,7 @@ bool cmLocalGenerator::NeedBackwardsCompatibility_2_4()
{ {
// Check the policy to decide whether to pay attention to this // Check the policy to decide whether to pay attention to this
// variable. // variable.
switch(this->Makefile->GetPolicyStatus(cmPolicies::CMP0001)) switch(this->GetPolicyStatus(cmPolicies::CMP0001))
{ {
case cmPolicies::WARN: case cmPolicies::WARN:
// WARN is just OLD without warning because user code does not // WARN is just OLD without warning because user code does not
@ -2976,6 +2976,12 @@ bool cmLocalGenerator::NeedBackwardsCompatibility_2_4()
actual_compat <= CMake_VERSION_ENCODE(2, 4, 255)); actual_compat <= CMake_VERSION_ENCODE(2, 4, 255));
} }
cmPolicies::PolicyStatus
cmLocalGenerator::GetPolicyStatus(cmPolicies::PolicyID id) const
{
return this->Makefile->GetPolicyStatus(id);
}
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
bool cmLocalGenerator::CheckDefinition(std::string const& define) const bool cmLocalGenerator::CheckDefinition(std::string const& define) const
{ {

2
Source/cmLocalGenerator.h
View File

@ -265,6 +265,8 @@ public:
*/ */
bool NeedBackwardsCompatibility_2_4(); bool NeedBackwardsCompatibility_2_4();
cmPolicies::PolicyStatus GetPolicyStatus(cmPolicies::PolicyID id) const;
cmake* GetCMakeInstance() const; cmake* GetCMakeInstance() const;
const char* GetSourceDirectory() const; const char* GetSourceDirectory() const;