[Cmake-commits] CMake branch, next, updated. v2.8.12.2-7576-g8be986b

Brad King brad.king at kitware.com
Mon Feb 10 11:40:18 EST 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  8be986b6210241610c8ae8e89f7ef8793226b0ef (commit)
       via  aab11bcab4d8f664784f3fd8d1184d0e5ced8f63 (commit)
      from  53f97f2e0739abfccccd3e6f9377b6d510859322 (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=8be986b6210241610c8ae8e89f7ef8793226b0ef
commit 8be986b6210241610c8ae8e89f7ef8793226b0ef
Merge: 53f97f2 aab11bc
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 10 11:40:17 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 10 11:40:17 2014 -0500

    Merge topic 'doc-policy-version-3.0' into next
    
    aab11bca Help: Change version 3.0.0 -> 3.0 in policy docs

diff --cc Help/policy/CMP0024.rst
index 42b7b9f,f81cc57..ee53d5f
--- a/Help/policy/CMP0024.rst
+++ b/Help/policy/CMP0024.rst
@@@ -14,9 -14,9 +14,9 @@@ targets instead in cases where the goa
  another name.
  
  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
 +an export() command.  The NEW behavior for this policy is not to
  allow including the result of an export() command.
  
- This policy was introduced in CMake version 3.0.0.  CMake version
+ This policy was introduced in CMake version 3.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.

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aab11bcab4d8f664784f3fd8d1184d0e5ced8f63
commit aab11bcab4d8f664784f3fd8d1184d0e5ced8f63
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 10 11:40:21 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Feb 10 11:40:21 2014 -0500

    Help: Change version 3.0.0 -> 3.0 in policy docs
    
    Starting with 3.0 we will use only two components for the feature level,
    and policies are only ever introduced with a bump to the feature level
    version.

diff --git a/Help/policy/CMP0024.rst b/Help/policy/CMP0024.rst
index abfcc75..f81cc57 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 3.0.0.  CMake version
+This policy was introduced in CMake version 3.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 fbb9b5e..f3b39e3 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 >= 3.0.0 recognize that Apple Clang is a different compiler
+CMake >= 3.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 < 3.0.0.  Therefore this policy determines
+"Clang" as it was in CMake < 3.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 3.0.0.  CMake version
+This policy was introduced in CMake version 3.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 d3079dc..460d2d1 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 3.0.0.  CMake version
+This policy was introduced in CMake version 3.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/CMP0027.rst b/Help/policy/CMP0027.rst
index 352f7b8..bedaffe 100644
--- a/Help/policy/CMP0027.rst
+++ b/Help/policy/CMP0027.rst
@@ -20,6 +20,6 @@ The NEW behavior of this policy is to report an error if an entry in
 the INTERFACE_INCLUDE_DIRECTORIES of a generator-expression
 conditionally linked IMPORTED target does not exist.
 
-This policy was introduced in CMake version 3.0.0.  CMake version
+This policy was introduced in CMake version 3.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/CMP0028.rst b/Help/policy/CMP0028.rst
index ec318a0..24889ec 100644
--- a/Help/policy/CMP0028.rst
+++ b/Help/policy/CMP0028.rst
@@ -18,6 +18,6 @@ even if the search term contains double-colons.  The NEW behavior for this
 policy is to issue a FATAL_ERROR if a link dependency contains
 double-colons but is not an IMPORTED target or an ALIAS target.
 
-This policy was introduced in CMake version 3.0.0.  CMake version
+This policy was introduced in CMake version 3.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/CMP0029.rst b/Help/policy/CMP0029.rst
index 92ef1ec..8f58a12 100644
--- a/Help/policy/CMP0029.rst
+++ b/Help/policy/CMP0029.rst
@@ -6,5 +6,5 @@ The :command:`subdir_depends` command should not be called.
 The implementation of this command has been empty since December 2001
 but was kept in CMake for compatibility for a long time.
 
-.. |disallowed_version| replace:: 3.0.0
+.. |disallowed_version| replace:: 3.0
 .. include:: DISALLOWED_COMMAND.txt
diff --git a/Help/policy/CMP0030.rst b/Help/policy/CMP0030.rst
index 6fcffc3..9e31b38 100644
--- a/Help/policy/CMP0030.rst
+++ b/Help/policy/CMP0030.rst
@@ -7,5 +7,5 @@ This command was created in September 2001 to support VTK before
 modern CMake language and custom command capabilities.  VTK has
 not used it in years.
 
-.. |disallowed_version| replace:: 3.0.0
+.. |disallowed_version| replace:: 3.0
 .. include:: DISALLOWED_COMMAND.txt
diff --git a/Help/policy/CMP0031.rst b/Help/policy/CMP0031.rst
index e97dd0a..6b89558 100644
--- a/Help/policy/CMP0031.rst
+++ b/Help/policy/CMP0031.rst
@@ -9,5 +9,5 @@ not work when the toolchain in use does not match the ABI of
 the CMake process.  It has been mostly superseded by the
 :command:`macro` and :command:`function` commands.
 
-.. |disallowed_version| replace:: 3.0.0
+.. |disallowed_version| replace:: 3.0
 .. include:: DISALLOWED_COMMAND.txt
diff --git a/Help/policy/CMP0032.rst b/Help/policy/CMP0032.rst
index 1b6be48..f394a06 100644
--- a/Help/policy/CMP0032.rst
+++ b/Help/policy/CMP0032.rst
@@ -9,5 +9,5 @@ has evolved since then but is not exposed through this command.  The
 scanning capabilities of this command are very limited and this
 functionality is better achieved through dedicated outside tools.
 
-.. |disallowed_version| replace:: 3.0.0
+.. |disallowed_version| replace:: 3.0
 .. include:: DISALLOWED_COMMAND.txt
diff --git a/Help/policy/CMP0033.rst b/Help/policy/CMP0033.rst
index 677e1c4..b420065 100644
--- a/Help/policy/CMP0033.rst
+++ b/Help/policy/CMP0033.rst
@@ -10,5 +10,5 @@ work for applications outside of the original build tree of a project.
 The functionality has been superseded by the :command:`export` and
 :command:`install(EXPORT)` commands.
 
-.. |disallowed_version| replace:: 3.0.0
+.. |disallowed_version| replace:: 3.0
 .. include:: DISALLOWED_COMMAND.txt
diff --git a/Help/policy/CMP0034.rst b/Help/policy/CMP0034.rst
index 1dd6e5c..2133997 100644
--- a/Help/policy/CMP0034.rst
+++ b/Help/policy/CMP0034.rst
@@ -7,5 +7,5 @@ This command was introduced in March 2001 to help build executables used to
 generate other files.  This approach has long been replaced by
 :command:`add_executable` combined with :command:`add_custom_command`.
 
-.. |disallowed_version| replace:: 3.0.0
+.. |disallowed_version| replace:: 3.0
 .. include:: DISALLOWED_COMMAND.txt
diff --git a/Help/policy/CMP0035.rst b/Help/policy/CMP0035.rst
index ebdaccc..7335b22 100644
--- a/Help/policy/CMP0035.rst
+++ b/Help/policy/CMP0035.rst
@@ -6,5 +6,5 @@ The :command:`variable_requires` command should not be called.
 This command was introduced in November 2001 to perform some conditional
 logic.  It has long been replaced by the :command:`if` command.
 
-.. |disallowed_version| replace:: 3.0.0
+.. |disallowed_version| replace:: 3.0
 .. include:: DISALLOWED_COMMAND.txt
diff --git a/Help/policy/CMP0036.rst b/Help/policy/CMP0036.rst
index 9a5a0fd..817f156 100644
--- a/Help/policy/CMP0036.rst
+++ b/Help/policy/CMP0036.rst
@@ -8,5 +8,5 @@ operating system and compiler combination.  The command has long been
 documented as discouraged and replaced by the :variable:`CMAKE_SYSTEM`
 and :variable:`CMAKE_<LANG>_COMPILER` variables.
 
-.. |disallowed_version| replace:: 3.0.0
+.. |disallowed_version| replace:: 3.0
 .. include:: DISALLOWED_COMMAND.txt
diff --git a/Help/policy/CMP0037.rst b/Help/policy/CMP0037.rst
index f4d2f4e..4d485bf 100644
--- a/Help/policy/CMP0037.rst
+++ b/Help/policy/CMP0037.rst
@@ -21,6 +21,6 @@ reserved names or which do not match the validity pattern.
 The NEW behavior for this policy is to report an error
 if an add_* command is used with an invalid target name.
 
-This policy was introduced in CMake version 3.0.0.  CMake version
+This policy was introduced in CMake version 3.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/CMP0038.rst b/Help/policy/CMP0038.rst
index e680780..df5af6a 100644
--- a/Help/policy/CMP0038.rst
+++ b/Help/policy/CMP0038.rst
@@ -11,6 +11,6 @@ The OLD behavior for this policy is to ignore targets which list themselves
 in their own link implementation.  The NEW behavior for this policy is to
 report an error if a target attempts to link to itself.
 
-This policy was introduced in CMake version 3.0.0.  CMake version
+This policy was introduced in CMake version 3.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/CMP0039.rst b/Help/policy/CMP0039.rst
index fb62eea..58ccc41 100644
--- a/Help/policy/CMP0039.rst
+++ b/Help/policy/CMP0039.rst
@@ -12,6 +12,6 @@ libraries of utility targets.  The NEW behavior for this policy is to
 report an error if an attempt is made to set the link libraries of a
 utility target.
 
-This policy was introduced in CMake version 3.0.0.  CMake version
+This policy was introduced in CMake version 3.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/CMP0040.rst b/Help/policy/CMP0040.rst
index 5d27f62..77a3c81 100644
--- a/Help/policy/CMP0040.rst
+++ b/Help/policy/CMP0040.rst
@@ -11,6 +11,6 @@ The OLD behavior for this policy is to ignore custom commands
 for unknown targets. The NEW behavior for this policy is to report an error
 if the target referenced in :command:`add_custom_command` is unknown.
 
-This policy was introduced in CMake version 3.0.0.  CMake version
+This policy was introduced in CMake version 3.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/CMP0041.rst b/Help/policy/CMP0041.rst
index acb85af..5a47de0 100644
--- a/Help/policy/CMP0041.rst
+++ b/Help/policy/CMP0041.rst
@@ -20,6 +20,6 @@ contain a generator expression. The NEW behavior for this policy is to report
 an error if a generator expression appears in another location and the path is
 relative.
 
-This policy was introduced in CMake version 3.0.0.  CMake version
+This policy was introduced in CMake version 3.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/CMP0042.rst b/Help/policy/CMP0042.rst
index 0ed3bd1..fce870c 100644
--- a/Help/policy/CMP0042.rst
+++ b/Help/policy/CMP0042.rst
@@ -9,11 +9,11 @@ name.  This was enabled by setting the target property
 flexible and powerful mechanism than ``@executable_path`` or ``@loader_path``
 for locating shared libraries.
 
-CMake 3.0.0 and later prefer this property to be ON by default.  Projects
+CMake 3.0 and later prefer this property to be ON by default.  Projects
 wanting ``@rpath`` in a target's install name may remove any setting of
 the :prop_tgt:`INSTALL_NAME_DIR` and :variable:`CMAKE_INSTALL_NAME_DIR`
 variables.
 
-This policy was introduced in CMake version 3.0.0.  CMake version
+This policy was introduced in CMake version 3.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/CMP0043.rst b/Help/policy/CMP0043.rst
index 89a6cde..43d6df2 100644
--- a/Help/policy/CMP0043.rst
+++ b/Help/policy/CMP0043.rst
@@ -34,6 +34,6 @@ The OLD behavior for this policy is to consume the content of the suffixed
 compilation command. The NEW behavior for this policy is to ignore the content
 of the :prop_tgt:`COMPILE_DEFINITIONS_<CONFIG>` target property .
 
-This policy was introduced in CMake version 3.0.0.  CMake version
+This policy was introduced in CMake version 3.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/CMP0044.rst b/Help/policy/CMP0044.rst
index edbadf5..4a3e215 100644
--- a/Help/policy/CMP0044.rst
+++ b/Help/policy/CMP0044.rst
@@ -14,6 +14,6 @@ with the value in the ``<LANG>_COMPILER_ID`` expression. The NEW behavior
 for this policy is to perform a case-sensitive comparison with the value in
 the ``<LANG>_COMPILER_ID`` expression.
 
-This policy was introduced in CMake version 3.0.0.  CMake version
+This policy was introduced in CMake version 3.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/CMP0045.rst b/Help/policy/CMP0045.rst
index 748eb6a..58c422f 100644
--- a/Help/policy/CMP0045.rst
+++ b/Help/policy/CMP0045.rst
@@ -12,6 +12,6 @@ variable to a ``-NOTFOUND`` value.  The NEW behavior
 for this policy is to issue a ``FATAL_ERROR`` if the command is called with a
 non-existent target.
 
-This policy was introduced in CMake version 3.0.0.  CMake version
+This policy was introduced in CMake version 3.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/CMP0046.rst b/Help/policy/CMP0046.rst
index 5192dc7..1a3bc65 100644
--- a/Help/policy/CMP0046.rst
+++ b/Help/policy/CMP0046.rst
@@ -11,7 +11,7 @@ dependencies. The NEW behavior for this policy is to report an error
 if non-existent dependencies are listed in the :command:`add_dependencies`
 command.
 
-This policy was introduced in CMake version 3.0.0.
+This policy was introduced in CMake version 3.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/CMP0047.rst b/Help/policy/CMP0047.rst
index 7b87c4d..c2d951b 100644
--- a/Help/policy/CMP0047.rst
+++ b/Help/policy/CMP0047.rst
@@ -10,7 +10,7 @@ The OLD behavior for this policy is to use the "GNU" compiler id for the qcc
 and QCC compiler drivers. The NEW behavior for this policy is to use the "QCC"
 compiler id for those drivers.
 
-This policy was introduced in CMake version 3.0.0.
+This policy was introduced in CMake version 3.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/CMP0048.rst b/Help/policy/CMP0048.rst
index ae51329..a54205e 100644
--- a/Help/policy/CMP0048.rst
+++ b/Help/policy/CMP0048.rst
@@ -3,7 +3,7 @@ CMP0048
 
 The :command:`project` command manages VERSION variables.
 
-CMake version 3.0.0 introduced the ``VERSION`` option of the :command:`project`
+CMake version 3.0 introduced the ``VERSION`` option of the :command:`project`
 command to specify a project version as well as the name.  In order to keep
 :variable:`PROJECT_VERSION` and related variables consistent with variable
 :variable:`PROJECT_NAME` it is necessary to set the VERSION variables
@@ -16,7 +16,7 @@ The OLD behavior for this policy is to leave VERSION variables untouched.
 The NEW behavior for this policy is to set VERSION as documented by the
 :command:`project` command.
 
-This policy was introduced in CMake version 3.0.0.
+This policy was introduced in CMake version 3.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.

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

Summary of changes:
 Help/policy/CMP0024.rst |    2 +-
 Help/policy/CMP0025.rst |    6 +++---
 Help/policy/CMP0026.rst |    2 +-
 Help/policy/CMP0027.rst |    2 +-
 Help/policy/CMP0028.rst |    2 +-
 Help/policy/CMP0029.rst |    2 +-
 Help/policy/CMP0030.rst |    2 +-
 Help/policy/CMP0031.rst |    2 +-
 Help/policy/CMP0032.rst |    2 +-
 Help/policy/CMP0033.rst |    2 +-
 Help/policy/CMP0034.rst |    2 +-
 Help/policy/CMP0035.rst |    2 +-
 Help/policy/CMP0036.rst |    2 +-
 Help/policy/CMP0037.rst |    2 +-
 Help/policy/CMP0038.rst |    2 +-
 Help/policy/CMP0039.rst |    2 +-
 Help/policy/CMP0040.rst |    2 +-
 Help/policy/CMP0041.rst |    2 +-
 Help/policy/CMP0042.rst |    4 ++--
 Help/policy/CMP0043.rst |    2 +-
 Help/policy/CMP0044.rst |    2 +-
 Help/policy/CMP0045.rst |    2 +-
 Help/policy/CMP0046.rst |    2 +-
 Help/policy/CMP0047.rst |    2 +-
 Help/policy/CMP0048.rst |    4 ++--
 25 files changed, 29 insertions(+), 29 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list