diff options
| author | Brad King <brad.king@kitware.com> | 2014-11-25 15:18:52 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-11-25 15:18:52 (GMT) |
| commit | 90cfed51f6aa56bda5b75af909b8ca565fc7b774 (patch) | |
| tree | f44d8ee4e97f74326c62e64ddf403bb41bc52677 /Help/command | |
| parent | 4987b3716583504442bb737c9d1f170ba99feed8 (diff) | |
| parent | bb1111eaa220eb534338410e2d1ffcf696f9ae44 (diff) | |
| download | CMake-90cfed51f6aa56bda5b75af909b8ca565fc7b774.zip CMake-90cfed51f6aa56bda5b75af909b8ca565fc7b774.tar.gz CMake-90cfed51f6aa56bda5b75af909b8ca565fc7b774.tar.bz2 | |
Merge topic 'improve-INTERFACE-property-docs'
bb1111ea Help: Warn that paths should not be used in INTERFACE_ build properties.
96691d12 Help: Fix typo in genex in documentation.
f8f02451 Help: Use a property-specific command instead of the generic one.
8609a884 Help: Make remaining build property docs consistent.
bcface39 Help: Link to target_link_libraries from target properies.
e12926e7 Help: Format the LINK_INTERFACE_LIBRARIES target properies.
c8540e94 Help: Unify the help text of INTERFACE_ build properties.
Diffstat (limited to 'Help/command')
| -rw-r--r-- | Help/command/target_include_directories.rst | 3 | ||||
| -rw-r--r-- | Help/command/target_link_libraries.rst | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/Help/command/target_include_directories.rst b/Help/command/target_include_directories.rst index fd433a8..1d236ce 100644 --- a/Help/command/target_include_directories.rst +++ b/Help/command/target_include_directories.rst @@ -54,3 +54,6 @@ installation prefix. For example: $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/mylib> $<INSTALL_INTERFACE:include/mylib> # <prefix>/include/mylib ) + +.. |INTERFACE_PROPERTY_LINK| replace:: :prop_tgt:`INTERFACE_INCLUDE_DIRECTORIES` +.. include:: /include/INTERFACE_INCLUDE_DIRECTORIES_WARNING.txt diff --git a/Help/command/target_link_libraries.rst b/Help/command/target_link_libraries.rst index 39537a7..e6a82b6 100644 --- a/Help/command/target_link_libraries.rst +++ b/Help/command/target_link_libraries.rst @@ -49,6 +49,9 @@ CMake will also propagate :ref:`usage requirements <Target Usage Requirements>` from linked library targets. Usage requirements of dependencies affect compilation of sources in the ``<target>``. +.. |INTERFACE_PROPERTY_LINK| replace:: :prop_tgt:`INTERFACE_LINK_LIBRARIES` +.. include:: /include/INTERFACE_LINK_LIBRARIES_WARNING.txt + If an ``<item>`` is a library in a Mac OX framework, the ``Headers`` directory of the framework will also be processed as a :ref:`usage requirement <Target Usage Requirements>`. This has the same |