[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-3147-ga4ad1ee

[Stephen Kelly]

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  a4ad1ee9b9114c134d42160e81f2e63c9724d774 (commit)
       via  7fb16e1d5ff37049788c6a2563bdef7bca9a389f (commit)
      from  dcee21353eff7a1d4cf2492788dfaa82970d9e88 (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=a4ad1ee9b9114c134d42160e81f2e63c9724d774
commit a4ad1ee9b9114c134d42160e81f2e63c9724d774
Merge: dcee213 7fb16e1
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue May 13 11:45:36 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue May 13 11:45:36 2014 -0400

    Merge topic 'WriteCompilerDetectionHeader-module' into next
    
    7fb16e1d Extend docs.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7fb16e1d5ff37049788c6a2563bdef7bca9a389f
commit 7fb16e1d5ff37049788c6a2563bdef7bca9a389f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue May 13 17:44:52 2014 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue May 13 17:44:52 2014 +0200

    Extend docs.

diff --git a/Modules/WriteCompilerDetectionHeader.cmake b/Modules/WriteCompilerDetectionHeader.cmake
index bf9b9ad..635fc81 100644
--- a/Modules/WriteCompilerDetectionHeader.cmake
+++ b/Modules/WriteCompilerDetectionHeader.cmake
@@ -117,10 +117,14 @@
 #
 # When the ``cxx_static_assert`` feature is not provided by the compiler,
 # a compatibility implementation is available via the
-# ``<PREFIX>_STATIC_ASSERT`` and ``<PREFIX>_STATIC_ASSERT_MSG``
-# function-like macros. The macros expand to ``static_assert`` where that
-# compiler feature is available, and to a compatibility implementation
-# otherwise.
+# ``<PREFIX>_STATIC_ASSERT(COND)`` and
+# ``<PREFIX>_STATIC_ASSERT_MSG(COND, MSG)`` function-like macros. The macros
+# expand to ``static_assert`` where that compiler feature is available, and
+# to a compatibility implementation otherwise. In the first form, the
+# condition is stringified in the message field of ``static_assert``.  In
+# the second form, the message ``MSG`` is passed to the message field of
+# ``static_assert``, or ignored if using the backward compatibility
+# implementation.
 #
 # ====================== ================================ ===================
 #         Feature                    Define                     Symbol

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

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


hooks/post-receive
-- 
CMake