[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-3149-g1a7dac3

[Brad King]

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  1a7dac34b5518d44794809156a306b91a7f50f22 (commit)
       via  8bed090ac83bd955d2909edc22fe90b1f1e8a42c (commit)
      from  a4ad1ee9b9114c134d42160e81f2e63c9724d774 (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=1a7dac34b5518d44794809156a306b91a7f50f22
commit 1a7dac34b5518d44794809156a306b91a7f50f22
Merge: a4ad1ee 8bed090
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue May 13 14:31:39 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue May 13 14:31:39 2014 -0400

    Merge topic 'WriteCompilerDetectionHeader-module' into next
    
    8bed090a WriteCompilerDetectionHeader: Revise version docs


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8bed090ac83bd955d2909edc22fe90b1f1e8a42c
commit 8bed090ac83bd955d2909edc22fe90b1f1e8a42c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue May 13 14:32:11 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue May 13 14:32:11 2014 -0400

    WriteCompilerDetectionHeader: Revise version docs

diff --git a/Modules/WriteCompilerDetectionHeader.cmake b/Modules/WriteCompilerDetectionHeader.cmake
index 635fc81..fd236c1 100644
--- a/Modules/WriteCompilerDetectionHeader.cmake
+++ b/Modules/WriteCompilerDetectionHeader.cmake
@@ -21,12 +21,14 @@
 # The ``write_compiler_detection_header`` function generates the
 # file ``<file>`` with macros which all have the prefix ``<prefix>``.
 #
-# ``VERSION`` may be used to specify compatibility with a specific
-# CMake version.  By default, a file is generated with compatibility with
-# the :variable:`CMAKE_MINIMUM_REQUIRED_VERSION`.  Newer CMake versions may
-# generate additional code, and the ``VERSION`` may be used to maintain
-# compatibility in the generated file while allowing the minimum CMake
-# version of the project to be changed independently.
+# ``VERSION`` may be used to specify the API version to be generated.
+# Future versions of CMake may introduce alternative APIs.  A given
+# API is selected by any ``<version>`` value greater than or equal
+# to the version of CMake that introduced the given API and less
+# than the version of CMake that introduced its succeeding API.
+# The value of the :variable:`CMAKE_MINIMUM_REQUIRED_VERSION`
+# variable is used if no explicit version is specified.
+# (As of CMake version |release| there is only one API version.)
 #
 # ``PROLOG`` may be specified as text content to write at the start of the
 # header. ``EPILOG`` may be specified as text content to write at the end

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

Summary of changes:
 Modules/WriteCompilerDetectionHeader.cmake |   14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMake