diff options
| author | Brad King <brad.king@kitware.com> | 2018-07-05 15:31:11 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-07-05 15:31:17 (GMT) |
| commit | 326ebdf12a59e7a115d7326299eb6be54316f34e (patch) | |
| tree | c8a86b423727fd8036b70af3adfd67b7745404ba /Help | |
| parent | ca733cdf4532a4a3d05b82c49a5f2fbf994149de (diff) | |
| parent | 0d7114987c78085df6449e93bdda8a1749862025 (diff) | |
| download | CMake-326ebdf12a59e7a115d7326299eb6be54316f34e.zip CMake-326ebdf12a59e7a115d7326299eb6be54316f34e.tar.gz CMake-326ebdf12a59e7a115d7326299eb6be54316f34e.tar.bz2 | |
Merge topic 'revert-subdirectory-linking'
0d7114987c Revert "target_link_libraries: Allow use with targets in other directories"
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2191
Diffstat (limited to 'Help')
| -rw-r--r-- | Help/command/target_link_libraries.rst | 2 | ||||
| -rw-r--r-- | Help/release/3.12.rst | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/Help/command/target_link_libraries.rst b/Help/command/target_link_libraries.rst index edf38cf..1f0d69e 100644 --- a/Help/command/target_link_libraries.rst +++ b/Help/command/target_link_libraries.rst @@ -18,7 +18,7 @@ All of them have the general form:: target_link_libraries(<target> ... <item>... ...) -The named ``<target>`` must have been created by +The named ``<target>`` must have been created in the current directory by a command such as :command:`add_executable` or :command:`add_library` and must not be an :ref:`ALIAS target <Alias Targets>`. Repeated calls for the same ``<target>`` append items in the order called. diff --git a/Help/release/3.12.rst b/Help/release/3.12.rst index 0655da1..bbeb11e 100644 --- a/Help/release/3.12.rst +++ b/Help/release/3.12.rst @@ -82,9 +82,6 @@ Commands :ref:`Object Libraries`. Linking to an object library uses its object files in direct dependents and also propagates usage requirements. -* The :command:`target_link_libraries` command may now be called - to modify targets created outside the current directory. - Variables --------- |