[Cmake-commits] CMake branch, next, updated. v3.0.0-rc1-749-g822c6f4
Brad King
brad.king at kitware.com
Sun Mar 9 10:42:11 EDT 2014
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 822c6f423250bb1b0dbe4fa4e1bb4c95bebb8f9c (commit)
via 50fd0a33c98245bbaaea3e772d0d98fb95d65c71 (commit)
via b1bbee3e9a284503b7372afd7b67dc9d5ba0c31a (commit)
from a0037c9b5328ef0bba9d276bde054c2f690e2665 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=822c6f423250bb1b0dbe4fa4e1bb4c95bebb8f9c
commit 822c6f423250bb1b0dbe4fa4e1bb4c95bebb8f9c
Merge: a0037c9 50fd0a3
Author: Brad King <brad.king at kitware.com>
AuthorDate: Sun Mar 9 10:42:09 2014 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Mar 9 10:42:09 2014 -0400
Merge topic 'fix-policy-scopes' into next
50fd0a33 Tests: Simplify and document policy scopes in RunCMake.CMP* tests
b1bbee3e Record more policies on targets when created
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=50fd0a33c98245bbaaea3e772d0d98fb95d65c71
commit 50fd0a33c98245bbaaea3e772d0d98fb95d65c71
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Mar 6 11:07:03 2014 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Mar 6 11:07:03 2014 -0500
Tests: Simplify and document policy scopes in RunCMake.CMP* tests
Drop unnecessary NO_POLICY_SCOPE options. Document why the remaining
options are necessary.
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)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b1bbee3e9a284503b7372afd7b67dc9d5ba0c31a
commit b1bbee3e9a284503b7372afd7b67dc9d5ba0c31a
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Mar 6 09:18:37 2014 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Mar 6 11:05:47 2014 -0500
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.
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\)
-----------------------------------------------------------------------
Summary of changes:
Source/cmComputeTargetDepends.cxx | 2 +-
Source/cmTarget.cxx | 4 ++--
Source/cmTarget.h | 5 ++++-
Tests/RunCMake/CMP0027/CMakeLists.txt | 2 +-
Tests/RunCMake/CMP0028/CMakeLists.txt | 2 +-
Tests/RunCMake/CMP0037/CMakeLists.txt | 2 +-
Tests/RunCMake/CMP0038/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/CMP0046/CMakeLists.txt | 2 +-
Tests/RunCMake/CMP0049/CMakeLists.txt | 2 +-
Tests/RunCMake/CMP0050/CMakeLists.txt | 2 +-
Tests/RunCMake/TargetPolicies/PolicyList-stderr.txt | 3 +++
17 files changed, 23 insertions(+), 17 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list