From b1bbee3e9a284503b7372afd7b67dc9d5ba0c31a Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 6 Mar 2014 09:18:37 -0500 Subject: Record more policies on targets when created Policies CMP0027, CMP0038, and CMP0046 have per-target meaning so record the policy settings on targets as they are created. --- Source/cmComputeTargetDepends.cxx | 2 +- Source/cmTarget.cxx | 4 ++-- Source/cmTarget.h | 5 ++++- Tests/RunCMake/CMP0027/CMakeLists.txt | 2 +- Tests/RunCMake/CMP0038/CMakeLists.txt | 2 +- Tests/RunCMake/CMP0046/CMakeLists.txt | 2 +- Tests/RunCMake/TargetPolicies/PolicyList-stderr.txt | 3 +++ 7 files changed, 13 insertions(+), 7 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; diff --git a/Tests/RunCMake/CMP0027/CMakeLists.txt b/Tests/RunCMake/CMP0027/CMakeLists.txt index 8f85fbf..12cd3c7 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/CMP0038/CMakeLists.txt b/Tests/RunCMake/CMP0038/CMakeLists.txt index 2f10cb0..a06591c 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/CMP0046/CMakeLists.txt b/Tests/RunCMake/CMP0046/CMakeLists.txt index 2f10cb0..a06591c 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/TargetPolicies/PolicyList-stderr.txt b/Tests/RunCMake/TargetPolicies/PolicyList-stderr.txt index 5a80872..f30c9a9 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\) -- cgit v0.12 From 50fd0a33c98245bbaaea3e772d0d98fb95d65c71 Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 6 Mar 2014 11:07:03 -0500 Subject: Tests: Simplify and document policy scopes in RunCMake.CMP* tests Drop unnecessary NO_POLICY_SCOPE options. Document why the remaining options are necessary. --- Tests/RunCMake/CMP0028/CMakeLists.txt | 2 +- Tests/RunCMake/CMP0037/CMakeLists.txt | 2 +- Tests/RunCMake/CMP0039/CMakeLists.txt | 2 +- Tests/RunCMake/CMP0040/CMakeLists.txt | 2 +- Tests/RunCMake/CMP0041/CMakeLists.txt | 2 +- Tests/RunCMake/CMP0042/CMakeLists.txt | 2 +- Tests/RunCMake/CMP0043/CMakeLists.txt | 2 +- Tests/RunCMake/CMP0045/CMakeLists.txt | 2 +- Tests/RunCMake/CMP0049/CMakeLists.txt | 2 +- Tests/RunCMake/CMP0050/CMakeLists.txt | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Tests/RunCMake/CMP0028/CMakeLists.txt b/Tests/RunCMake/CMP0028/CMakeLists.txt index f1d9cae..144cdb4 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 f1d9cae..f452db1 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/CMP0039/CMakeLists.txt b/Tests/RunCMake/CMP0039/CMakeLists.txt index 2f10cb0..a06591c 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 2f10cb0..a06591c 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 f1d9cae..f452db1 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 f1d9cae..f452db1 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 5e95460..d027f3e 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 f1d9cae..f452db1 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/CMP0049/CMakeLists.txt b/Tests/RunCMake/CMP0049/CMakeLists.txt index 2f10cb0..a06591c 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 2f10cb0..a06591c 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) -- cgit v0.12