diff options
| author | Brad King <brad.king@kitware.com> | 2014-03-10 13:36:28 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-03-10 13:36:28 (GMT) |
| commit | 98e3831a67823af2aabab473a7920c96c6e502d1 (patch) | |
| tree | fa439bc88474e21e62dd7a14b827eb9f68b051e2 /Source | |
| parent | 51988a4fce528de090a62d5c7b4d24637542c916 (diff) | |
| parent | 50fd0a33c98245bbaaea3e772d0d98fb95d65c71 (diff) | |
| download | CMake-98e3831a67823af2aabab473a7920c96c6e502d1.zip CMake-98e3831a67823af2aabab473a7920c96c6e502d1.tar.gz CMake-98e3831a67823af2aabab473a7920c96c6e502d1.tar.bz2 | |
Merge branch 'fix-policy-scopes' into release
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmComputeTargetDepends.cxx | 2 | ||||
| -rw-r--r-- | Source/cmTarget.cxx | 4 | ||||
| -rw-r--r-- | Source/cmTarget.h | 5 |
3 files changed, 7 insertions, 4 deletions
diff --git a/Source/cmComputeTargetDepends.cxx b/Source/cmComputeTargetDepends.cxx index 6511510..7870564 100644 --- a/Source/cmComputeTargetDepends.cxx +++ b/Source/cmComputeTargetDepends.cxx @@ -349,7 +349,7 @@ void cmComputeTargetDepends::AddTargetDepend(int depender_index, cmMakefile *makefile = depender->GetMakefile(); cmake::MessageType messageType = cmake::AUTHOR_WARNING; bool issueMessage = false; - switch(makefile->GetPolicyStatus(cmPolicies::CMP0046)) + switch(depender->GetPolicyStatusCMP0046()) { case cmPolicies::WARN: issueMessage = true; diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index db34bd8..84a9a7c 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -1730,7 +1730,7 @@ static void processIncludeDirectories(cmTarget const* tgt, cmake::MessageType messageType = cmake::FATAL_ERROR; if (fromEvaluatedImported) { - switch(mf->GetPolicyStatus(cmPolicies::CMP0027)) + switch(tgt->GetPolicyStatusCMP0027()) { case cmPolicies::WARN: e << (mf->GetPolicies() @@ -5662,7 +5662,7 @@ void cmTarget::ComputeLinkImplementation(const char* config, bool noMessage = false; cmake::MessageType messageType = cmake::FATAL_ERROR; cmOStringStream e; - switch(this->Makefile->GetPolicyStatus(cmPolicies::CMP0038)) + switch(this->GetPolicyStatusCMP0038()) { case cmPolicies::WARN: { diff --git a/Source/cmTarget.h b/Source/cmTarget.h index 271824b..0e9d682 100644 --- a/Source/cmTarget.h +++ b/Source/cmTarget.h @@ -26,8 +26,11 @@ F(CMP0020) \ F(CMP0021) \ F(CMP0022) \ + F(CMP0027) \ + F(CMP0038) \ F(CMP0041) \ - F(CMP0042) + F(CMP0042) \ + F(CMP0046) class cmake; class cmMakefile; |