[Cmake-commits] CMake branch, next, updated. v2.8.12-4113-g3eec950

Brad King brad.king at kitware.com
Thu Oct 17 15:28:47 EDT 2013


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  3eec9503150f37ecc21b6179628745a62442ca67 (commit)
       via  1873205a6e8e15e1dbb88d6c82454837d7544259 (commit)
      from  57da68971626833f00d424addadaa66b3e287801 (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=3eec9503150f37ecc21b6179628745a62442ca67
commit 3eec9503150f37ecc21b6179628745a62442ca67
Merge: 57da689 1873205
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 17 15:28:46 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 17 15:28:46 2013 -0400

    Merge topic 'fix-policy-versions' into next
    
    1873205 Update CMP0024/CMP0025/CMP0026 release version


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1873205a6e8e15e1dbb88d6c82454837d7544259
commit 1873205a6e8e15e1dbb88d6c82454837d7544259
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 17 15:12:14 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 17 15:14:53 2013 -0400

    Update CMP0024/CMP0025/CMP0026 release version
    
    These policies were introduced after 2.8.12 in anticipation of 2.8.13.
    However, we've now decided the next release will be 3.0.0, so update the
    version of introduction accordingly.

diff --git a/Help/policy/CMP0024.rst b/Help/policy/CMP0024.rst
index ce0b2e6..4c8c714 100644
--- a/Help/policy/CMP0024.rst
+++ b/Help/policy/CMP0024.rst
@@ -17,6 +17,6 @@ The OLD behavior for this policy is to allow including the result of
 an export() command.  The NEW behavior for this policy is to not to
 allow including the result of an export() command.
 
-This policy was introduced in CMake version 2.8.13.  CMake version
+This policy was introduced in CMake version 3.0.0.  CMake version
 |release| warns when the policy is not set and uses OLD behavior.  Use
 the cmake_policy command to set it to OLD or NEW explicitly.
diff --git a/Help/policy/CMP0025.rst b/Help/policy/CMP0025.rst
index 25957e9..fbb9b5e 100644
--- a/Help/policy/CMP0025.rst
+++ b/Help/policy/CMP0025.rst
@@ -3,12 +3,12 @@ CMP0025
 
 Compiler id for Apple Clang is now AppleClang.
 
-CMake >= 2.8.13 recognize that Apple Clang is a different compiler
+CMake >= 3.0.0 recognize that Apple Clang is a different compiler
 than upstream Clang and that they have different version numbers.
 CMake now prefers to present this to projects by setting
 CMAKE_<LANG>_COMPILER_ID to "AppleClang" instead of "Clang".  However,
 existing projects may assume the compiler id for Apple Clang is just
-"Clang" as it was in CMake < 2.8.13.  Therefore this policy determines
+"Clang" as it was in CMake < 3.0.0.  Therefore this policy determines
 for Apple Clang which compiler id to report in
 CMAKE_<LANG>_COMPILER_ID after <LANG> is enabled by the project() or
 enable_language() command.
@@ -16,6 +16,6 @@ enable_language() command.
 The OLD behavior for this policy is to use compiler id "Clang".  The
 NEW behavior for this policy is to use compiler id "AppleClang".
 
-This policy was introduced in CMake version 2.8.13.  CMake version
+This policy was introduced in CMake version 3.0.0.  CMake version
 |release| warns when the policy is not set and uses OLD behavior.  Use
 the cmake_policy command to set it to OLD or NEW explicitly.
diff --git a/Help/policy/CMP0026.rst b/Help/policy/CMP0026.rst
index 585da56..d3079dc 100644
--- a/Help/policy/CMP0026.rst
+++ b/Help/policy/CMP0026.rst
@@ -20,6 +20,6 @@ The OLD behavior for this policy is to allow reading the LOCATION
 property from build-targets.  The NEW behavior for this policy is to
 not to allow reading the LOCATION property from build-targets.
 
-This policy was introduced in CMake version 2.8.13.  CMake version
+This policy was introduced in CMake version 3.0.0.  CMake version
 |release| warns when the policy is not set and uses OLD behavior.  Use
 the cmake_policy command to set it to OLD or NEW explicitly.
diff --git a/Source/cmPolicies.cxx b/Source/cmPolicies.cxx
index 5f5cdd8..2ecdb42 100644
--- a/Source/cmPolicies.cxx
+++ b/Source/cmPolicies.cxx
@@ -225,17 +225,17 @@ cmPolicies::cmPolicies()
   this->DefinePolicy(
     CMP0024, "CMP0024",
     "Disallow include export result.",
-    2,8,13,0, cmPolicies::WARN);
+    3,0,0,0, cmPolicies::WARN);
 
   this->DefinePolicy(
     CMP0025, "CMP0025",
     "Compiler id for Apple Clang is now AppleClang.",
-    2,8,13,0, cmPolicies::WARN);
+    3,0,0,0, cmPolicies::WARN);
 
   this->DefinePolicy(
     CMP0026, "CMP0026",
     "Disallow use of the LOCATION target property.",
-    2,8,13,0, cmPolicies::WARN);
+    3,0,0,0, cmPolicies::WARN);
 }
 
 cmPolicies::~cmPolicies()

-----------------------------------------------------------------------

Summary of changes:
 Help/policy/CMP0024.rst |    2 +-
 Help/policy/CMP0025.rst |    6 +++---
 Help/policy/CMP0026.rst |    2 +-
 Source/cmPolicies.cxx   |    6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list