[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-3143-gba57010

Brad King brad.king at kitware.com
Tue May 13 10:06:07 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  ba5701091d7944aef01657a96d8ec262e8c572cb (commit)
       via  01a716563d27df2cbed07b4f778e4c55da8ad7ac (commit)
      from  d01a94a0e7edccdd13a23bc92a1ef01b16275637 (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=ba5701091d7944aef01657a96d8ec262e8c572cb
commit ba5701091d7944aef01657a96d8ec262e8c572cb
Merge: d01a94a 01a7165
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue May 13 10:06:06 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue May 13 10:06:06 2014 -0400

    Merge topic 'WriteCompilerDetectionHeader-module' into next
    
    01a71656 WriteCompilerDetectionHeader: Minor documentation updates


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=01a716563d27df2cbed07b4f778e4c55da8ad7ac
commit 01a716563d27df2cbed07b4f778e4c55da8ad7ac
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue May 13 10:06:49 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue May 13 10:06:49 2014 -0400

    WriteCompilerDetectionHeader: Minor documentation updates

diff --git a/Help/release/dev/module-WriteCompilerDetectionHeader.rst b/Help/release/dev/module-WriteCompilerDetectionHeader.rst
index d355d2c..10e7b86 100644
--- a/Help/release/dev/module-WriteCompilerDetectionHeader.rst
+++ b/Help/release/dev/module-WriteCompilerDetectionHeader.rst
@@ -1,5 +1,5 @@
 module-WriteCompilerDetectionHeader
 -----------------------------------
 
-* The WriteCompilerDetectionHeader module was added to allow creation of
-  a portable header file for compiler optional feature detection.
+* The :module:`WriteCompilerDetectionHeader` module was added to allow
+  creation of a portable header file for compiler optional feature detection.
diff --git a/Modules/WriteCompilerDetectionHeader.cmake b/Modules/WriteCompilerDetectionHeader.cmake
index c2f829a..bf9b9ad 100644
--- a/Modules/WriteCompilerDetectionHeader.cmake
+++ b/Modules/WriteCompilerDetectionHeader.cmake
@@ -21,8 +21,8 @@
 # The ``write_compiler_detection_header`` function generates the
 # file ``<file>`` with macros which all have the prefix ``<prefix>``.
 #
-# ``VERSION`` may be used to specify a generation compatibility with older
-# CMake versions.  By default, a file is generated with compatibility with
+# ``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
@@ -35,9 +35,11 @@
 # At least one ``<compiler>`` and one ``<feature>`` must be listed.  Compilers
 # which are known to CMake, but not specified are detected and a preprocessor
 # ``#error`` is generated for them.  A preprocessor macro matching
-# ``<PREFIX>_COMPILER_IS_${CompilerId}`` is generated for each compiler
+# ``<PREFIX>_COMPILER_IS_<compiler>`` is generated for each compiler
 # known to CMake to contain the value ``0`` or ``1``.
 #
+# Possible compiler identifiers are documented with the
+# :variable:`CMAKE_<LANG>_COMPILER_ID` variable.
 # Available features in this version of CMake are listed in the
 # :prop_gbl:`CMAKE_CXX_KNOWN_FEATURES` global property.
 #
@@ -45,10 +47,11 @@
 # ===================
 #
 # For each compiler, a preprocessor test of the compiler version is generated
-# denoting whether the each feature is enabled.  A preprocessor macro
-# matching ``<PREFIX>_COMPILER_${FEATURE_NAME_UPPER}`` is generated to
-# contain the value ``0`` or ``1`` depending on whether the compiler in
-# use supports the feature:
+# denoting whether each feature is enabled.  A preprocessor macro
+# matching ``<PREFIX>_COMPILER_<FEATURE>``, where ``<FEATURE>`` is the
+# upper-case ``<feature>`` name, is generated to contain the value
+# ``0`` or ``1`` depending on whether the compiler in use supports the
+# feature:
 #
 # .. code-block:: cmake
 #
@@ -114,7 +117,7 @@
 #
 # 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``
+# ``<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.

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

Summary of changes:
 .../dev/module-WriteCompilerDetectionHeader.rst     |    4 ++--
 Modules/WriteCompilerDetectionHeader.cmake          |   19 +++++++++++--------
 2 files changed, 13 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list