diff options
| author | Brad King <brad.king@kitware.com> | 2014-03-06 14:18:37 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-03-06 16:05:47 (GMT) |
| commit | b1bbee3e9a284503b7372afd7b67dc9d5ba0c31a (patch) | |
| tree | 504884a40b12aaedd70a08471217e8246bb9a6d8 | |
| parent | a7c956b86736ea82ade88bea6414cd6a8c84e307 (diff) | |
| download | CMake-b1bbee3e9a284503b7372afd7b67dc9d5ba0c31a.zip CMake-b1bbee3e9a284503b7372afd7b67dc9d5ba0c31a.tar.gz CMake-b1bbee3e9a284503b7372afd7b67dc9d5ba0c31a.tar.bz2 | |
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.
| -rw-r--r-- | Source/cmComputeTargetDepends.cxx | 2 | ||||
| -rw-r--r-- | Source/cmTarget.cxx | 4 | ||||
| -rw-r--r-- | Source/cmTarget.h | 5 | ||||
| -rw-r--r-- | Tests/RunCMake/CMP0027/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Tests/RunCMake/CMP0038/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Tests/RunCMake/CMP0046/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | 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\) |