[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5595-g5e331e3

Stephen Kelly steveire at gmail.com
Thu Nov 21 06:25:39 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  5e331e39955124641defd320c7bf8e3eee6973bd (commit)
       via  783a3202425b6d28afdd689fa9136490fdbd0d75 (commit)
       via  75bfe4cbd0a3d534d902a991558073ecf06c54e9 (commit)
      from  0d7ebe362cde87a33cd7a81092d0d2b2c0792c18 (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=5e331e39955124641defd320c7bf8e3eee6973bd
commit 5e331e39955124641defd320c7bf8e3eee6973bd
Merge: 0d7ebe3 783a320
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Nov 21 06:25:30 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Nov 21 06:25:30 2013 -0500

    Merge topic 'genex-docs' into next
    
    783a320 Help: Reformat the generator expression documentation.
    75bfe4c CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=783a3202425b6d28afdd689fa9136490fdbd0d75
commit 783a3202425b6d28afdd689fa9136490fdbd0d75
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Nov 20 22:01:41 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Nov 21 12:25:00 2013 +0100

    Help: Reformat the generator expression documentation.
    
    Use description lists instead of a preformatted block to enumerate
    the genex documentation.
    
    Consistently capitalize the description.
    
    Use ``...`` to format genex parameters in the description.
    
    Turn references to commands into links.
    
    Add high level documentation about the motivation for generator
    expressions.
    
    Regroup expressions into subsections for different genex types. Add
    a high-level description and example of the expressions in each
    section.
    
    Explode the documentation for filesystem artifacts, instead of only
    referring to the variations.

diff --git a/Help/manual/cmake-generator-expressions.7.rst b/Help/manual/cmake-generator-expressions.7.rst
index ddde183..c7d2ed2 100644
--- a/Help/manual/cmake-generator-expressions.7.rst
+++ b/Help/manual/cmake-generator-expressions.7.rst
@@ -10,77 +10,170 @@ cmake-generator-expressions(7)
 Generator Expressions
 =====================
 
-Generator expressions are evaluated during build
-system generation to produce information specific to each build
-configuration.  Valid expressions are:
-
-::
-
-  $<0:...>                  = empty string (ignores "...")
-  $<1:...>                  = content of "..."
-  $<CONFIG:cfg>             = '1' if config is "cfg", else '0'
-  $<CONFIGURATION>          = configuration name
-  $<BOOL:...>               = '1' if the '...' is true, else '0'
-  $<STREQUAL:a,b>           = '1' if a is STREQUAL b, else '0'
-  $<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 ';'.
-  $<JOIN:list,...>          = joins the list with the content of "..."
-  $<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:...>  = content of "..." when the property is exported using install(EXPORT), and empty otherwise.
-  $<BUILD_INTERFACE:...>    = content of "..." when the property is exported using export(), or when the target is used by another target in the same buildsystem. Expands to the empty string otherwise.
-  $<PLATFORM_ID>            = The CMake-id of the platform   $<PLATFORM_ID:comp>       = '1' if the The CMake-id of the platform matches comp, otherwise '0'.
-  $<C_COMPILER_ID>          = The CMake-id of the C compiler used.
-  $<C_COMPILER_ID:comp>     = '1' if the CMake-id of the C compiler matches comp, otherwise '0'.
-  $<CXX_COMPILER_ID>        = The CMake-id of the CXX compiler used.
-  $<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>     = The version of the C compiler used.
-  $<C_COMPILER_VERSION:ver> = '1' if the version of the C compiler matches ver, otherwise '0'.
-  $<CXX_COMPILER_VERSION>   = The version of the CXX compiler used.
-  $<CXX_COMPILER_VERSION:ver> = '1' if the version of the CXX compiler matches ver, otherwise '0'.
-  $<TARGET_FILE:tgt>        = main file (.exe, .so.1.2, .a)
-  $<TARGET_LINKER_FILE:tgt> = file used to link (.a, .lib, .so)
-  $<TARGET_SONAME_FILE:tgt> = file with soname (.so.3)
-
-where "tgt" is the name of a target.  Target file expressions produce
-a full path, but _DIR and _NAME versions can produce the directory and
-file name components:
-
-::
-
-  $<TARGET_FILE_DIR:tgt>/$<TARGET_FILE_NAME:tgt>
-  $<TARGET_LINKER_FILE_DIR:tgt>/$<TARGET_LINKER_FILE_NAME:tgt>
-  $<TARGET_SONAME_FILE_DIR:tgt>/$<TARGET_SONAME_FILE_NAME:tgt>
-
-
-
-::
-
-  $<TARGET_PROPERTY:tgt,prop>   = The 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_POLICY:pol>          = '1' if the policy 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.
-  $<INSTALL_PREFIX>         = Content of the install prefix when the target is exported via INSTALL(EXPORT) and empty otherwise.
-
-Boolean expressions:
-
-::
-
-  $<AND:?[,?]...>           = '1' if all '?' are '1', else '0'
-  $<OR:?[,?]...>            = '0' if all '?' are '0', else '1'
-  $<NOT:?>                  = '0' if '?' is '1', else '1'
-
-where '?' is always either '0' or '1'.
-
-Expressions with an implicit 'this' target:
-
-::
-
-  $<TARGET_PROPERTY:prop>   = The value of the property prop on the target on which the generator expression is evaluated.
+Generator expressions are evaluated during build system generation to produce
+information specific to each build configuration.
+
+Generator expressions are allowed in the context of many target properties,
+such as :prop_tgt:`LINK_LIBRARIES`, :prop_tgt:`INCLUDE_DIRECTORIES`,
+:prop_tgt:`COMPILE_DEFINITIONS` and others.  They may also be used when using
+commands to populate those properties, such as :command:`target_link_libraries`,
+:command:`target_include_directories`, :command:`target_compile_definitions`
+and others.
+
+This means that they enable conditional linking, conditional
+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 are used to create conditional output.  The basic
+expressions are the ``0`` and ``1`` expressions.  Because other logical
+expressions evaluate to either ``0`` or ``1``, they can be composed to
+create conditional output::
+
+  $<$<CONFIG:Debug>:DEBUG_MODE>
+
+expands to ``DEBUG_MODE`` when the ``Debug`` configuration is used, and
+otherwise expands to nothing.
+
+$<0:...>
+  Empty string (ignores ``...``)
+$<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.
+  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
+  will be emitted. This generator expression only works for a subset of
+  policies.
+
+Informational expressions
+-------------------------
+
+These expressions expand to some information. The information may be used
+directly, eg::
+
+  include_directories(/usr/include/$<CXX_COMPILER_ID>/)
+
+expands to ``/usr/include/GNU/`` or ``/usr/include/Clang/`` etc, depending on
+the Id of the compiler.
+
+These expressions may also may be combined with logical expressions::
+
+  $<$<VERSION_LESS:$<CXX_COMPILER_VERSION>,4.2.0>:OLD_COMPILER>
+
+expands to ``OLD_COMPILER`` if the :variable:`CMAKE_<LANG>_COMPILER_VERSION` is
+less than 4.2.0.
+
+$<CONFIGURATION>
+  Configuration name
+$<PLATFORM_ID>
+  The CMake-id of the platform
+$<C_COMPILER_ID>
+  The CMake-id of the C compiler used.
+$<CXX_COMPILER_ID>
+  The CMake-id of the CXX compiler used.
+$<C_COMPILER_VERSION>
+  The version of the C compiler used.
+$<CXX_COMPILER_VERSION>
+  The version of the CXX compiler used.
+$<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>
+  Name of main file (.exe, .so.1.2, .a).
+$<TARGET_FILE_DIR:tgt>
+  Directory of main file (.exe, .so.1.2, .a).
+$<TARGET_LINKER_FILE:tgt>
+  File used to link (.a, .lib, .so) where ``tgt`` is the name of a target.
+$<TARGET_LINKER_FILE_NAME:tgt>
+  Name of file used to link (.a, .lib, .so).
+$<TARGET_LINKER_FILE_DIR:tgt>
+  Directory of file used to link (.a, .lib, .so).
+$<TARGET_SONAME_FILE:tgt>
+  File with soname (.so.3) where ``tgt`` is the name of a target.
+$<TARGET_SONAME_FILE_NAME:tgt>
+  Name of file with soname (.so.3).
+$<TARGET_SONAME_FILE_DIR:tgt>
+  Directory of with soname (.so.3).
+$<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>
+  Value of the property ``prop`` on the target on which the generator
+  expression is evaluated.
+$<INSTALL_PREFIX>
+  Content of the install prefix when the target is exported via
+  :command:`install` (EXPORT) and empty otherwise.
+
+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
+comparison::
+
+  -I$<JOIN:$<TARGET_PROPERTY:INCLUDE_DIRECTORIES>, -I>
+
+generates a string of the entries in the :prop_tgt:`INCLUDE_DIRECTORIES` target
+property with each entry preceeded by ``-I``. Note that a more-complete use
+in this situation would be require first checking if the INCLUDE_DIRECTORIES
+property is non-empty::
+
+  $<$<BOOL:$<TARGET_PROPERTY:INCLUDE_DIRECTORIES>>:-I$<JOIN:$<TARGET_PROPERTY:INCLUDE_DIRECTORIES>, -I>>
+
+$<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:...>
+  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:...>
+  Content of ``...`` when the property is exported using :command:`install` (EXPORT),
+  and empty otherwise.
+$<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 |  241 +++++++++++++++++--------
 Source/CMakeVersion.cmake                     |    2 +-
 2 files changed, 168 insertions(+), 75 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list