[Cmake-commits] CMake branch, next, updated. v2.8.11-2508-ge5098c8

[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  e5098c8bc8c50527c64c084154fbeff1e96c7a2f (commit)
       via  b62d440ea8cf16e1eab3d8fec5f36abdee0f4bab (commit)
      from  f40bc69cd8628d51a0bf3a4138bc337cbab10207 (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=e5098c8bc8c50527c64c084154fbeff1e96c7a2f
commit e5098c8bc8c50527c64c084154fbeff1e96c7a2f
Merge: f40bc69 b62d440
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jun 4 08:24:24 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jun 4 08:24:24 2013 -0400

    Merge topic 'doc-CMAKE_PARENT_LIST_FILE' into next
    
    b62d440 Docs: Clarify CMAKE_PARENT_LIST_FILE (#14194)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b62d440ea8cf16e1eab3d8fec5f36abdee0f4bab
commit b62d440ea8cf16e1eab3d8fec5f36abdee0f4bab
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jun 4 08:18:15 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jun 4 08:18:15 2013 -0400

    Docs: Clarify CMAKE_PARENT_LIST_FILE (#14194)
    
    Fix the wording of the documentation for CMAKE_PARENT_LIST_FILE to
    clarify that it only applies to the include stack in the current
    directory.  Specify exactly what commands can include files instead of
    saying "somehow invoke".

diff --git a/Source/cmDocumentVariables.cxx b/Source/cmDocumentVariables.cxx
index b383265..689508f 100644
--- a/Source/cmDocumentVariables.cxx
+++ b/Source/cmDocumentVariables.cxx
@@ -345,11 +345,12 @@ void cmDocumentVariables::DefineVariables(cmake* cm)
 
   cm->DefineProperty
     ("CMAKE_PARENT_LIST_FILE", cmProperty::VARIABLE,
-     "Full path to the parent listfile of the one currently being processed.",
-     "As CMake processes the listfiles in your project this "
-     "variable will always be set to the listfile that included "
-     "or somehow invoked the one currently being "
-     "processed. See also CMAKE_CURRENT_LIST_FILE.",false,
+     "Full path to the CMake file that included the current one.",
+     "While processing a CMake file loaded by include() or find_package() "
+     "this variable contains the full path to the file including it.  "
+     "The top of the include stack is always the CMakeLists.txt for the "
+     "current directory.  "
+     "See also CMAKE_CURRENT_LIST_FILE.",false,
      "Variables that Provide Information");
 
   cm->DefineProperty

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

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


hooks/post-receive
-- 
CMake