[Cmake-commits] CMake branch, next, updated. v2.8.10.2-1274-ga88b8c7

[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  a88b8c7c587923b76896dd68a1cd8a7479ddaa61 (commit)
       via  f249999e5388ed3822ede71481f62457f893f80b (commit)
      from  e26c1f7fd713e6637e1b487fad601638ef503fb1 (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=a88b8c7c587923b76896dd68a1cd8a7479ddaa61
commit a88b8c7c587923b76896dd68a1cd8a7479ddaa61
Merge: e26c1f7 f249999
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Dec 11 14:02:16 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Dec 11 14:02:16 2012 -0500

    Merge topic 'DocumentLIBRARY_PATH' into next
    
    f249999 Documentation: Clarify handling of implicit link directories


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f249999e5388ed3822ede71481f62457f893f80b
commit f249999e5388ed3822ede71481f62457f893f80b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Dec 11 13:59:15 2012 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Dec 11 13:59:15 2012 -0500

    Documentation: Clarify handling of implicit link directories
    
    The wording introduced in the parent commit sounds like CMake reads the
    LIBRARY_PATH environment variable, but it is the toolchain that reads
    it.

diff --git a/Source/cmDocumentVariables.cxx b/Source/cmDocumentVariables.cxx
index 6b64dc5..32c543d 100644
--- a/Source/cmDocumentVariables.cxx
+++ b/Source/cmDocumentVariables.cxx
@@ -1621,12 +1621,15 @@ void cmDocumentVariables::DefineVariables(cmake* cm)
      "These paths are implicit linker search directories for the compiler's "
      "language.  "
      "CMake automatically detects these directories for each language and "
-     "reports the results in this variable.  The content of the environment "
-     "variable LIBRARY_PATH during the initial CMake run influences the "
-     "contents of the CMAKE_<LANG>_IMPLICIT_LINK_DIRECTORIES variable.  When "
-     "linking with the full path against a library located in one of these "
-     "directories, only the short form of the link line, e.g. -lFoo, will be "
-     "used instead of the full path.", false,
+     "reports the results in this variable."
+     "\n"
+     "When a library in one of these directories is given by full path to "
+     "target_link_libraries() CMake will generate the -l<name> form on "
+     "link lines to ensure the linker searches its implicit directories "
+     "for the library.  "
+     "Note that some toolchains read implicit directories from an "
+     "environment variable such as LIBRARY_PATH so keep its value "
+     "consistent when operating in a given build tree.",false,
      "Variables for Languages");
 
   cm->DefineProperty

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

Summary of changes:
 Source/cmDocumentVariables.cxx |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMake