diff options
| author | Brad King <brad.king@kitware.com> | 2018-07-03 15:26:19 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-07-03 16:54:32 (GMT) |
| commit | 84ecbf44b6d3953bb7f33dd48c4382bc3c15f519 (patch) | |
| tree | cbca85f3113985013e81149df74de9880ad2b29e /Help | |
| parent | 890be0145def8d9c469fcaf6db1e7e6bc485f6cc (diff) | |
| parent | 0d7114987c78085df6449e93bdda8a1749862025 (diff) | |
| download | CMake-84ecbf44b6d3953bb7f33dd48c4382bc3c15f519.zip CMake-84ecbf44b6d3953bb7f33dd48c4382bc3c15f519.tar.gz CMake-84ecbf44b6d3953bb7f33dd48c4382bc3c15f519.tar.bz2 | |
Merge branch 'revert-subdirectory-linking' into release-3.12
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 6379730..fcc2c07 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 79ebc8e..f6fdb5a 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 --------- |