Merge branch 'fix-policy-scopes' into release

17 files changed, 23 insertions, 17 deletions

diff --git a/Source/cmComputeTargetDepends.cxx b/Source/cmComputeTargetDepends.cxx
index 6511510ca7..7870564461 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 db34bd826c..84a9a7ca14 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 271824ba97..0e9d6824a5 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;
diff --git a/Tests/RunCMake/CMP0027/CMakeLists.txt b/Tests/RunCMake/CMP0027/CMakeLists.txt
index 8f85fbf540..12cd3c7757 100644
--- a/Tests/RunCMake/CMP0027/CMakeLists.txt
+++ b/Tests/RunCMake/CMP0027/CMakeLists.txt
@@ -1,3 +1,3 @@
 cmake_minimum_required(VERSION 2.8.4)
 project(${RunCMake_TEST} NONE)
-include(${RunCMake_TEST}.cmake NO_POLICY_SCOPE)
+include(${RunCMake_TEST}.cmake)
diff --git a/Tests/RunCMake/CMP0028/CMakeLists.txt b/Tests/RunCMake/CMP0028/CMakeLists.txt
index f1d9caecda..144cdb4ee3 100644
--- a/Tests/RunCMake/CMP0028/CMakeLists.txt
+++ b/Tests/RunCMake/CMP0028/CMakeLists.txt
@@ -1,3 +1,3 @@
 cmake_minimum_required(VERSION 2.8.4)
 project(${RunCMake_TEST} CXX)
-include(${RunCMake_TEST}.cmake NO_POLICY_SCOPE)
+include(${RunCMake_TEST}.cmake NO_POLICY_SCOPE) # policy used at end of dir
diff --git a/Tests/RunCMake/CMP0037/CMakeLists.txt b/Tests/RunCMake/CMP0037/CMakeLists.txt
index f1d9caecda..f452db1770 100644
--- a/Tests/RunCMake/CMP0037/CMakeLists.txt
+++ b/Tests/RunCMake/CMP0037/CMakeLists.txt
@@ -1,3 +1,3 @@
 cmake_minimum_required(VERSION 2.8.4)
 project(${RunCMake_TEST} CXX)
-include(${RunCMake_TEST}.cmake NO_POLICY_SCOPE)
+include(${RunCMake_TEST}.cmake)
diff --git a/Tests/RunCMake/CMP0038/CMakeLists.txt b/Tests/RunCMake/CMP0038/CMakeLists.txt
index 2f10cb0922..a06591c31f 100644
--- a/Tests/RunCMake/CMP0038/CMakeLists.txt
+++ b/Tests/RunCMake/CMP0038/CMakeLists.txt
@@ -1,3 +1,3 @@
 cmake_minimum_required(VERSION 2.8.12)
 project(${RunCMake_TEST} CXX)
-include(${RunCMake_TEST}.cmake NO_POLICY_SCOPE)
+include(${RunCMake_TEST}.cmake)
diff --git a/Tests/RunCMake/CMP0039/CMakeLists.txt b/Tests/RunCMake/CMP0039/CMakeLists.txt
index 2f10cb0922..a06591c31f 100644
--- a/Tests/RunCMake/CMP0039/CMakeLists.txt
+++ b/Tests/RunCMake/CMP0039/CMakeLists.txt
@@ -1,3 +1,3 @@
 cmake_minimum_required(VERSION 2.8.12)
 project(${RunCMake_TEST} CXX)
-include(${RunCMake_TEST}.cmake NO_POLICY_SCOPE)
+include(${RunCMake_TEST}.cmake)
diff --git a/Tests/RunCMake/CMP0040/CMakeLists.txt b/Tests/RunCMake/CMP0040/CMakeLists.txt
index 2f10cb0922..a06591c31f 100644
--- a/Tests/RunCMake/CMP0040/CMakeLists.txt
+++ b/Tests/RunCMake/CMP0040/CMakeLists.txt
@@ -1,3 +1,3 @@
 cmake_minimum_required(VERSION 2.8.12)
 project(${RunCMake_TEST} CXX)
-include(${RunCMake_TEST}.cmake NO_POLICY_SCOPE)
+include(${RunCMake_TEST}.cmake)
diff --git a/Tests/RunCMake/CMP0041/CMakeLists.txt b/Tests/RunCMake/CMP0041/CMakeLists.txt
index f1d9caecda..f452db1770 100644
--- a/Tests/RunCMake/CMP0041/CMakeLists.txt
+++ b/Tests/RunCMake/CMP0041/CMakeLists.txt
@@ -1,3 +1,3 @@
 cmake_minimum_required(VERSION 2.8.4)
 project(${RunCMake_TEST} CXX)
-include(${RunCMake_TEST}.cmake NO_POLICY_SCOPE)
+include(${RunCMake_TEST}.cmake)
diff --git a/Tests/RunCMake/CMP0042/CMakeLists.txt b/Tests/RunCMake/CMP0042/CMakeLists.txt
index f1d9caecda..f452db1770 100644
--- a/Tests/RunCMake/CMP0042/CMakeLists.txt
+++ b/Tests/RunCMake/CMP0042/CMakeLists.txt
@@ -1,3 +1,3 @@
 cmake_minimum_required(VERSION 2.8.4)
 project(${RunCMake_TEST} CXX)
-include(${RunCMake_TEST}.cmake NO_POLICY_SCOPE)
+include(${RunCMake_TEST}.cmake)
diff --git a/Tests/RunCMake/CMP0043/CMakeLists.txt b/Tests/RunCMake/CMP0043/CMakeLists.txt
index 5e954601a2..d027f3e0ef 100644
--- a/Tests/RunCMake/CMP0043/CMakeLists.txt
+++ b/Tests/RunCMake/CMP0043/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 2.8.4)
 project(${RunCMake_TEST} CXX)
-include(${RunCMake_TEST}.cmake NO_POLICY_SCOPE)
+include(${RunCMake_TEST}.cmake NO_POLICY_SCOPE) # policy used at end of dir
 
 if(CMAKE_BUILD_TYPE)
   # Dummy variable use
diff --git a/Tests/RunCMake/CMP0045/CMakeLists.txt b/Tests/RunCMake/CMP0045/CMakeLists.txt
index f1d9caecda..f452db1770 100644
--- a/Tests/RunCMake/CMP0045/CMakeLists.txt
+++ b/Tests/RunCMake/CMP0045/CMakeLists.txt
@@ -1,3 +1,3 @@
 cmake_minimum_required(VERSION 2.8.4)
 project(${RunCMake_TEST} CXX)
-include(${RunCMake_TEST}.cmake NO_POLICY_SCOPE)
+include(${RunCMake_TEST}.cmake)
diff --git a/Tests/RunCMake/CMP0046/CMakeLists.txt b/Tests/RunCMake/CMP0046/CMakeLists.txt
index 2f10cb0922..a06591c31f 100644
--- a/Tests/RunCMake/CMP0046/CMakeLists.txt
+++ b/Tests/RunCMake/CMP0046/CMakeLists.txt
@@ -1,3 +1,3 @@
 cmake_minimum_required(VERSION 2.8.12)
 project(${RunCMake_TEST} CXX)
-include(${RunCMake_TEST}.cmake NO_POLICY_SCOPE)
+include(${RunCMake_TEST}.cmake)
diff --git a/Tests/RunCMake/CMP0049/CMakeLists.txt b/Tests/RunCMake/CMP0049/CMakeLists.txt
index 2f10cb0922..a06591c31f 100644
--- a/Tests/RunCMake/CMP0049/CMakeLists.txt
+++ b/Tests/RunCMake/CMP0049/CMakeLists.txt
@@ -1,3 +1,3 @@
 cmake_minimum_required(VERSION 2.8.12)
 project(${RunCMake_TEST} CXX)
-include(${RunCMake_TEST}.cmake NO_POLICY_SCOPE)
+include(${RunCMake_TEST}.cmake)
diff --git a/Tests/RunCMake/CMP0050/CMakeLists.txt b/Tests/RunCMake/CMP0050/CMakeLists.txt
index 2f10cb0922..a06591c31f 100644
--- a/Tests/RunCMake/CMP0050/CMakeLists.txt
+++ b/Tests/RunCMake/CMP0050/CMakeLists.txt
@@ -1,3 +1,3 @@
 cmake_minimum_required(VERSION 2.8.12)
 project(${RunCMake_TEST} CXX)
-include(${RunCMake_TEST}.cmake NO_POLICY_SCOPE)
+include(${RunCMake_TEST}.cmake)
diff --git a/Tests/RunCMake/TargetPolicies/PolicyList-stderr.txt b/Tests/RunCMake/TargetPolicies/PolicyList-stderr.txt
index 5a80872943..f30c9a933d 100644
--- a/Tests/RunCMake/TargetPolicies/PolicyList-stderr.txt
+++ b/Tests/RunCMake/TargetPolicies/PolicyList-stderr.txt
@@ -11,8 +11,11 @@
    \* CMP0020
    \* CMP0021
    \* CMP0022
+   \* CMP0027
+   \* CMP0038
    \* CMP0041
    \* CMP0042
+   \* CMP0046
 
 Call Stack \(most recent call first\):
   CMakeLists.txt:3 \(include\)