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

Merge branch 'fix-policy-scopes' into release

This commit is contained in:
Brad King 2014-03-10 09:36:28 -04:00
parent 51988a4fce 50fd0a33c9
commit 98e3831a67
17 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmComputeTargetDepends.cxx
View File

@ -349,7 +349,7 @@ void cmComputeTargetDepends::AddTargetDepend(int depender_index,
cmMakefile *makefile = depender->GetMakefile(); cmMakefile *makefile = depender->GetMakefile();
cmake::MessageType messageType = cmake::AUTHOR_WARNING; cmake::MessageType messageType = cmake::AUTHOR_WARNING;
bool issueMessage = false; bool issueMessage = false;
switch(makefile->GetPolicyStatus(cmPolicies::CMP0046)) switch(depender->GetPolicyStatusCMP0046())
{ {
case cmPolicies::WARN: case cmPolicies::WARN:
issueMessage = true; issueMessage = true;

4
Source/cmTarget.cxx
View File

@ -1730,7 +1730,7 @@ static void processIncludeDirectories(cmTarget const* tgt,
cmake::MessageType messageType = cmake::FATAL_ERROR; cmake::MessageType messageType = cmake::FATAL_ERROR;
if (fromEvaluatedImported) if (fromEvaluatedImported)
{ {
switch(mf->GetPolicyStatus(cmPolicies::CMP0027)) switch(tgt->GetPolicyStatusCMP0027())
{ {
case cmPolicies::WARN: case cmPolicies::WARN:
e << (mf->GetPolicies() e << (mf->GetPolicies()
@ -5662,7 +5662,7 @@ void cmTarget::ComputeLinkImplementation(const char* config,
bool noMessage = false; bool noMessage = false;
cmake::MessageType messageType = cmake::FATAL_ERROR; cmake::MessageType messageType = cmake::FATAL_ERROR;
cmOStringStream e; cmOStringStream e;
switch(this->Makefile->GetPolicyStatus(cmPolicies::CMP0038)) switch(this->GetPolicyStatusCMP0038())
{ {
case cmPolicies::WARN: case cmPolicies::WARN:
{ {

5
Source/cmTarget.h
View File

@ -26,8 +26,11 @@
F(CMP0020) \ F(CMP0020) \
F(CMP0021) \ F(CMP0021) \
F(CMP0022) \ F(CMP0022) \
F(CMP0027) \
F(CMP0038) \
F(CMP0041) \ F(CMP0041) \
F(CMP0042) F(CMP0042) \
F(CMP0046)
class cmake; class cmake;
class cmMakefile; class cmMakefile;

2
Tests/RunCMake/CMP0027/CMakeLists.txt
View File

@ -1,3 +1,3 @@
cmake_minimum_required(VERSION 2.8.4) cmake_minimum_required(VERSION 2.8.4)
project(${RunCMake_TEST} NONE) project(${RunCMake_TEST} NONE)
include(${RunCMake_TEST}.cmake NO_POLICY_SCOPE) include(${RunCMake_TEST}.cmake)

2
Tests/RunCMake/CMP0028/CMakeLists.txt
View File

@ -1,3 +1,3 @@
cmake_minimum_required(VERSION 2.8.4) cmake_minimum_required(VERSION 2.8.4)
project(${RunCMake_TEST} CXX) project(${RunCMake_TEST} CXX)
include(${RunCMake_TEST}.cmake NO_POLICY_SCOPE) include(${RunCMake_TEST}.cmake NO_POLICY_SCOPE) # policy used at end of dir

2
Tests/RunCMake/CMP0037/CMakeLists.txt
View File

@ -1,3 +1,3 @@
cmake_minimum_required(VERSION 2.8.4) cmake_minimum_required(VERSION 2.8.4)
project(${RunCMake_TEST} CXX) project(${RunCMake_TEST} CXX)
include(${RunCMake_TEST}.cmake NO_POLICY_SCOPE) include(${RunCMake_TEST}.cmake)

2
Tests/RunCMake/CMP0038/CMakeLists.txt
View File

@ -1,3 +1,3 @@
cmake_minimum_required(VERSION 2.8.12) cmake_minimum_required(VERSION 2.8.12)
project(${RunCMake_TEST} CXX) project(${RunCMake_TEST} CXX)
include(${RunCMake_TEST}.cmake NO_POLICY_SCOPE) include(${RunCMake_TEST}.cmake)

2
Tests/RunCMake/CMP0039/CMakeLists.txt
View File

@ -1,3 +1,3 @@
cmake_minimum_required(VERSION 2.8.12) cmake_minimum_required(VERSION 2.8.12)
project(${RunCMake_TEST} CXX) project(${RunCMake_TEST} CXX)
include(${RunCMake_TEST}.cmake NO_POLICY_SCOPE) include(${RunCMake_TEST}.cmake)

2
Tests/RunCMake/CMP0040/CMakeLists.txt
View File

@ -1,3 +1,3 @@
cmake_minimum_required(VERSION 2.8.12) cmake_minimum_required(VERSION 2.8.12)
project(${RunCMake_TEST} CXX) project(${RunCMake_TEST} CXX)
include(${RunCMake_TEST}.cmake NO_POLICY_SCOPE) include(${RunCMake_TEST}.cmake)

2
Tests/RunCMake/CMP0041/CMakeLists.txt
View File

@ -1,3 +1,3 @@
cmake_minimum_required(VERSION 2.8.4) cmake_minimum_required(VERSION 2.8.4)
project(${RunCMake_TEST} CXX) project(${RunCMake_TEST} CXX)
include(${RunCMake_TEST}.cmake NO_POLICY_SCOPE) include(${RunCMake_TEST}.cmake)

2
Tests/RunCMake/CMP0042/CMakeLists.txt
View File

@ -1,3 +1,3 @@
cmake_minimum_required(VERSION 2.8.4) cmake_minimum_required(VERSION 2.8.4)
project(${RunCMake_TEST} CXX) project(${RunCMake_TEST} CXX)
include(${RunCMake_TEST}.cmake NO_POLICY_SCOPE) include(${RunCMake_TEST}.cmake)

2
Tests/RunCMake/CMP0043/CMakeLists.txt
View File

@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 2.8.4) cmake_minimum_required(VERSION 2.8.4)
project(${RunCMake_TEST} CXX) 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) if(CMAKE_BUILD_TYPE)
# Dummy variable use # Dummy variable use

2
Tests/RunCMake/CMP0045/CMakeLists.txt
View File

@ -1,3 +1,3 @@
cmake_minimum_required(VERSION 2.8.4) cmake_minimum_required(VERSION 2.8.4)
project(${RunCMake_TEST} CXX) project(${RunCMake_TEST} CXX)
include(${RunCMake_TEST}.cmake NO_POLICY_SCOPE) include(${RunCMake_TEST}.cmake)

2
Tests/RunCMake/CMP0046/CMakeLists.txt
View File

@ -1,3 +1,3 @@
cmake_minimum_required(VERSION 2.8.12) cmake_minimum_required(VERSION 2.8.12)
project(${RunCMake_TEST} CXX) project(${RunCMake_TEST} CXX)
include(${RunCMake_TEST}.cmake NO_POLICY_SCOPE) include(${RunCMake_TEST}.cmake)

2
Tests/RunCMake/CMP0049/CMakeLists.txt
View File

@ -1,3 +1,3 @@
cmake_minimum_required(VERSION 2.8.12) cmake_minimum_required(VERSION 2.8.12)
project(${RunCMake_TEST} CXX) project(${RunCMake_TEST} CXX)
include(${RunCMake_TEST}.cmake NO_POLICY_SCOPE) include(${RunCMake_TEST}.cmake)

2
Tests/RunCMake/CMP0050/CMakeLists.txt
View File

@ -1,3 +1,3 @@
cmake_minimum_required(VERSION 2.8.12) cmake_minimum_required(VERSION 2.8.12)
project(${RunCMake_TEST} CXX) project(${RunCMake_TEST} CXX)
include(${RunCMake_TEST}.cmake NO_POLICY_SCOPE) include(${RunCMake_TEST}.cmake)

3
Tests/RunCMake/TargetPolicies/PolicyList-stderr.txt
View File

@ -11,8 +11,11 @@
\* CMP0020 \* CMP0020
\* CMP0021 \* CMP0021
\* CMP0022 \* CMP0022
\* CMP0027
\* CMP0038
\* CMP0041 \* CMP0041
\* CMP0042 \* CMP0042
\* CMP0046
Call Stack \(most recent call first\): Call Stack \(most recent call first\):
CMakeLists.txt:3 \(include\) CMakeLists.txt:3 \(include\)