diff options
| author | Brad King <brad.king@kitware.com> | 2015-01-26 14:17:35 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-01-26 14:17:35 (GMT) |
| commit | 163bbff24afb284f3de142354c6c6ec75a6a7b67 (patch) | |
| tree | 52d65940cddde623ecad5cfd903102df8121af79 | |
| parent | f6308b01398fdb5095f28662be326c66806eef20 (diff) | |
| parent | c7310917e6b5efa6ef867ef5cabc5b5649d97b67 (diff) | |
| download | CMake-163bbff24afb284f3de142354c6c6ec75a6a7b67.zip CMake-163bbff24afb284f3de142354c6c6ec75a6a7b67.tar.gz CMake-163bbff24afb284f3de142354c6c6ec75a6a7b67.tar.bz2 | |
Merge branch 'doc-link_libraries-note' into release
| -rw-r--r-- | Help/command/link_libraries.rst | 19 | ||||
| -rw-r--r-- | Help/manual/cmake-commands.7.rst | 2 |
2 files changed, 12 insertions, 9 deletions
diff --git a/Help/command/link_libraries.rst b/Help/command/link_libraries.rst index d690c9b..fd5dc37 100644 --- a/Help/command/link_libraries.rst +++ b/Help/command/link_libraries.rst @@ -1,16 +1,19 @@ link_libraries -------------- -Deprecated. Use the target_link_libraries() command instead. - Link libraries to all targets added later. :: - link_libraries(library1 <debug | optimized> library2 ...) + link_libraries([item1 [item2 [...]]] + [[debug|optimized|general] <item>] ...) + +Specify libraries or flags to use when linking any targets created later in +the current directory or below by commands such as :command:`add_executable` +or :command:`add_library`. See the :command:`target_link_libraries` command +for meaning of arguments. -Specify a list of libraries to be linked into any following targets -(typically added with the add_executable or add_library calls). This -command is passed down to all subdirectories. The debug and optimized -strings may be used to indicate that the next library listed is to be -used only for that specific type of build. +.. note:: + The :command:`target_link_libraries` command should be preferred whenever + possible. Library dependencies are chained automatically, so directory-wide + specification of link libraries is rarely needed. diff --git a/Help/manual/cmake-commands.7.rst b/Help/manual/cmake-commands.7.rst index 9c1d3b9..14871f2 100644 --- a/Help/manual/cmake-commands.7.rst +++ b/Help/manual/cmake-commands.7.rst @@ -67,6 +67,7 @@ These commands may be used freely in CMake projects. /command/include /command/install /command/link_directories + /command/link_libraries /command/list /command/load_cache /command/load_command @@ -117,7 +118,6 @@ versions of CMake. Do not use them in new code. /command/install_files /command/install_programs /command/install_targets - /command/link_libraries /command/make_directory /command/output_required_files /command/remove |