[Cmake-commits] CMake branch, next, updated. v3.1.1-2312-g8bc5b3c

[Brad King]

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  8bc5b3cfb1b0e7af49b9e0c6a4c269b5be273f5a (commit)
       via  c7310917e6b5efa6ef867ef5cabc5b5649d97b67 (commit)
      from  c4c05f4d6619641c241f90e43301e924013d0e69 (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=8bc5b3cfb1b0e7af49b9e0c6a4c269b5be273f5a
commit 8bc5b3cfb1b0e7af49b9e0c6a4c269b5be273f5a
Merge: c4c05f4 c731091
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 26 09:15:43 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 26 09:15:43 2015 -0500

    Merge topic 'doc-link_libraries-note' into next
    
    c7310917 Help: Clarify status of link_libraries command


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c7310917e6b5efa6ef867ef5cabc5b5649d97b67
commit c7310917e6b5efa6ef867ef5cabc5b5649d97b67
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 26 09:13:47 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jan 26 09:15:00 2015 -0500

    Help: Clarify status of link_libraries command
    
    The command has been documented as 'deprecated', but it is not really
    slated for removal and can still be used.  Clarify this in the
    documentation.  While at it, revise the documentation to use wording
    more consistent with that now in target_link_libraries.
    
    Suggested-by: Christoph Grüninger <foss at grueninger.de>

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

-----------------------------------------------------------------------

Summary of changes:
 Help/command/link_libraries.rst  |   19 +++++++++++--------
 Help/manual/cmake-commands.7.rst |    2 +-
 2 files changed, 12 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
CMake