[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5644-g54a837a

Brad King brad.king at kitware.com
Thu Nov 21 14:49:19 EST 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  54a837ad48ea2d292f6e4c5d72a18d00d2a9942f (commit)
       via  18d4338f5b957015917179506e0bac0a49368c90 (commit)
      from  182974bdb9a7368df3ace0bf5ec2ac0d6abc19bc (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=54a837ad48ea2d292f6e4c5d72a18d00d2a9942f
commit 54a837ad48ea2d292f6e4c5d72a18d00d2a9942f
Merge: 182974b 18d4338
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Nov 21 14:49:16 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Nov 21 14:49:16 2013 -0500

    Merge topic 'genex-docs' into next
    
    18d4338 Help: Tweak cmake-generator-expressions formatting


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=18d4338f5b957015917179506e0bac0a49368c90
commit 18d4338f5b957015917179506e0bac0a49368c90
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Nov 21 14:27:32 2013 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Nov 21 14:28:20 2013 -0500

    Help: Tweak cmake-generator-expressions formatting
    
    Replace "'" with "``" in most instances.  Quote each definition list
    entry to ensure it shows up literally.  Make each expression type
    section equal to the introduction level section heading.

diff --git a/Help/manual/cmake-generator-expressions.7.rst b/Help/manual/cmake-generator-expressions.7.rst
index cfbe255..2a2b7dc 100644
--- a/Help/manual/cmake-generator-expressions.7.rst
+++ b/Help/manual/cmake-generator-expressions.7.rst
@@ -7,8 +7,8 @@ cmake-generator-expressions(7)
 
    .. contents::
 
-Generator Expressions
-=====================
+Introduction
+============
 
 Generator expressions are evaluated during build system generation to produce
 information specific to each build configuration.
@@ -25,8 +25,8 @@ definitions used when compiling, and conditional include directories and
 more.  The conditions may be based on the build configuration, target
 properties, platform information or any other queryable information.
 
-Logical expressions
--------------------
+Logical Expressions
+===================
 
 Logical expressions are used to create conditional output.  The basic
 expressions are the ``0`` and ``1`` expressions.  Because other logical
@@ -38,52 +38,52 @@ create conditional output::
 expands to ``DEBUG_MODE`` when the ``Debug`` configuration is used, and
 otherwise expands to nothing.
 
-$<0:...>
+``$<0:...>``
   Empty string (ignores ``...``)
-$<1:...>
+``$<1:...>``
   Content of ``...``
-$<BOOL:...>
-  '1' if the ``...`` is true, else '0'
-$<AND:?[,?]...>
-  '1' if all ``?`` are '1', else '0'
-
-  The ``?`` must always be either '0' or '1' in boolean expressions.
-
-$<OR:?[,?]...>
-  '0' if all ``?`` are '0', else '1'
-$<NOT:?>
-  '0' if ``?`` is '1', else '1'
-$<STREQUAL:a,b>
-  '1' if ``a`` is STREQUAL ``b``, else '0'
-$<CONFIG:cfg>
-  '1' if config is ``cfg``, else '0'. This is a case-insensitive comparison.
+``$<BOOL:...>``
+  ``1`` if the ``...`` is true, else ``0``
+``$<AND:?[,?]...>``
+  ``1`` if all ``?`` are ``1``, else ``0``
+
+  The ``?`` must always be either ``0`` or ``1`` in boolean expressions.
+
+``$<OR:?[,?]...>``
+  ``0`` if all ``?`` are ``0``, else ``1``
+``$<NOT:?>``
+  ``0`` if ``?`` is ``1``, else ``1``
+``$<STREQUAL:a,b>``
+  ``1`` if ``a`` is STREQUAL ``b``, else ``0``
+``$<CONFIG:cfg>``
+  ``1`` if config is ``cfg``, else ``0``. This is a case-insensitive comparison.
   The mapping in :prop_tgt:`MAP_IMPORTED_CONFIG_<CONFIG>` is also considered by
   this expression when it is evaluated on a property on an :prop_tgt:`IMPORTED`
   target.
-$<PLATFORM_ID:comp>
-  '1' if the CMake-id of the platform matches ``comp``, otherwise '0'.
-$<C_COMPILER_ID:comp>
-  '1' if the CMake-id of the C compiler matches ``comp``, otherwise '0'.
-$<CXX_COMPILER_ID:comp>
-  '1' if the CMake-id of the CXX compiler matches ``comp``, otherwise '0'.
-$<VERSION_GREATER:v1,v2>
-  '1' if ``v1`` is a version greater than ``v2``, else '0'.
-$<VERSION_LESS:v1,v2>
-  '1' if ``v1`` is a version less than ``v2``, else '0'.
-$<VERSION_EQUAL:v1,v2>
-  '1' if ``v1`` is the same version as ``v2``, else '0'.
-$<C_COMPILER_VERSION:ver>
-  '1' if the version of the C compiler matches ``ver``, otherwise '0'.
-$<CXX_COMPILER_VERSION:ver>
-  '1' if the version of the CXX compiler matches ``ver``, otherwise '0'.
-$<TARGET_POLICY:pol>
-  '1' if the policy ``pol`` was NEW when the 'head' target was created,
-  else '0'.  If the policy was not set, the warning message for the policy
+``$<PLATFORM_ID:comp>``
+  ``1`` if the CMake-id of the platform matches ``comp``, otherwise ``0``.
+``$<C_COMPILER_ID:comp>``
+  ``1`` if the CMake-id of the C compiler matches ``comp``, otherwise ``0``.
+``$<CXX_COMPILER_ID:comp>``
+  ``1`` if the CMake-id of the CXX compiler matches ``comp``, otherwise ``0``.
+``$<VERSION_GREATER:v1,v2>``
+  ``1`` if ``v1`` is a version greater than ``v2``, else ``0``.
+``$<VERSION_LESS:v1,v2>``
+  ``1`` if ``v1`` is a version less than ``v2``, else ``0``.
+``$<VERSION_EQUAL:v1,v2>``
+  ``1`` if ``v1`` is the same version as ``v2``, else ``0``.
+``$<C_COMPILER_VERSION:ver>``
+  ``1`` if the version of the C compiler matches ``ver``, otherwise ``0``.
+``$<CXX_COMPILER_VERSION:ver>``
+  ``1`` if the version of the CXX compiler matches ``ver``, otherwise ``0``.
+``$<TARGET_POLICY:pol>``
+  ``1`` if the policy ``pol`` was NEW when the 'head' target was created,
+  else ``0``.  If the policy was not set, the warning message for the policy
   will be emitted. This generator expression only works for a subset of
   policies.
 
-Informational expressions
--------------------------
+Informational Expressions
+=========================
 
 These expressions expand to some information. The information may be used
 directly, eg::
@@ -101,50 +101,50 @@ expands to ``OLD_COMPILER`` if the
 :variable:`CMAKE_CXX_COMPILER_VERSION <CMAKE_<LANG>_COMPILER_VERSION>` is less
 than 4.2.0.
 
-$<CONFIGURATION>
+``$<CONFIGURATION>``
   Configuration name
-$<PLATFORM_ID>
+``$<PLATFORM_ID>``
   The CMake-id of the platform
-$<C_COMPILER_ID>
+``$<C_COMPILER_ID>``
   The CMake-id of the C compiler used.
-$<CXX_COMPILER_ID>
+``$<CXX_COMPILER_ID>``
   The CMake-id of the CXX compiler used.
-$<C_COMPILER_VERSION>
+``$<C_COMPILER_VERSION>``
   The version of the C compiler used.
-$<CXX_COMPILER_VERSION>
+``$<CXX_COMPILER_VERSION>``
   The version of the CXX compiler used.
-$<TARGET_FILE:tgt>
+``$<TARGET_FILE:tgt>``
   Full path to main file (.exe, .so.1.2, .a) where ``tgt`` is the name of a target.
-$<TARGET_FILE_NAME:tgt>
+``$<TARGET_FILE_NAME:tgt>``
   Name of main file (.exe, .so.1.2, .a).
-$<TARGET_FILE_DIR:tgt>
+``$<TARGET_FILE_DIR:tgt>``
   Directory of main file (.exe, .so.1.2, .a).
-$<TARGET_LINKER_FILE:tgt>
+``$<TARGET_LINKER_FILE:tgt>``
   File used to link (.a, .lib, .so) where ``tgt`` is the name of a target.
-$<TARGET_LINKER_FILE_NAME:tgt>
+``$<TARGET_LINKER_FILE_NAME:tgt>``
   Name of file used to link (.a, .lib, .so).
-$<TARGET_LINKER_FILE_DIR:tgt>
+``$<TARGET_LINKER_FILE_DIR:tgt>``
   Directory of file used to link (.a, .lib, .so).
-$<TARGET_SONAME_FILE:tgt>
+``$<TARGET_SONAME_FILE:tgt>``
   File with soname (.so.3) where ``tgt`` is the name of a target.
-$<TARGET_SONAME_FILE_NAME:tgt>
+``$<TARGET_SONAME_FILE_NAME:tgt>``
   Name of file with soname (.so.3).
-$<TARGET_SONAME_FILE_DIR:tgt>
+``$<TARGET_SONAME_FILE_DIR:tgt>``
   Directory of with soname (.so.3).
-$<TARGET_PROPERTY:tgt,prop>
+``$<TARGET_PROPERTY:tgt,prop>``
   Value of the property ``prop`` on the target ``tgt``.
 
   Note that ``tgt`` is not added as a dependency of the target this
   expression is evaluated on.
-$<TARGET_PROPERTY:prop>
+``$<TARGET_PROPERTY:prop>``
   Value of the property ``prop`` on the target on which the generator
   expression is evaluated.
-$<INSTALL_PREFIX>
+``$<INSTALL_PREFIX>``
   Content of the install prefix when the target is exported via
   :command:`install(EXPORT)` and empty otherwise.
 
-Output expressions
-------------------
+Output Expressions
+==================
 
 These expressions generate output, in some cases depending on an input. These
 expressions may be combined with other expressions for information or logical
@@ -159,22 +159,22 @@ property is non-empty::
 
   $<$<BOOL:$<TARGET_PROPERTY:INCLUDE_DIRECTORIES>>:-I$<JOIN:$<TARGET_PROPERTY:INCLUDE_DIRECTORIES>, -I>>
 
-$<JOIN:list,...>
+``$<JOIN:list,...>``
   Joins the list with the content of ``...``
-$<ANGLE-R>
-  A literal '>'. Used to compare strings which contain a '>' for example.
-$<COMMA>
-  A literal ','. Used to compare strings which contain a ',' for example.
-$<SEMICOLON>
-  A literal ';'. Used to prevent list expansion on an argument with ';'.
-$<TARGET_NAME:...>
+``$<ANGLE-R>``
+  A literal ``>``. Used to compare strings which contain a ``>`` for example.
+``$<COMMA>``
+  A literal ``,``. Used to compare strings which contain a ``,`` for example.
+``$<SEMICOLON>``
+  A literal ``;``. Used to prevent list expansion on an argument with ``;``.
+``$<TARGET_NAME:...>``
   Marks ``...`` as being the name of a target.  This is required if exporting
   targets to multiple dependent export sets.  The ``...`` must be a literal
   name of a target- it may not contain generator expressions.
-$<INSTALL_INTERFACE:...>
+``$<INSTALL_INTERFACE:...>``
   Content of ``...`` when the property is exported using :command:`install(EXPORT)`,
   and empty otherwise.
-$<BUILD_INTERFACE:...>
+``$<BUILD_INTERFACE:...>``
   Content of ``...`` when the property is exported using :command:`export`, or
   when the target is used by another target in the same buildsystem. Expands to
   the empty string otherwise.

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

Summary of changes:
 Help/manual/cmake-generator-expressions.7.rst |  144 ++++++++++++------------
 1 files changed, 72 insertions(+), 72 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list