[Cmake-commits] CMake branch, next, updated. v2.8.11.2-2983-gb0859bc

[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  b0859bc89b3514d10d98d5c8f9e27bc6b002e9d5 (commit)
       via  e934b1f50359ae229015ad5453fee4df89ece055 (commit)
      from  c2f4bb59cf72bcfa5c88c1d988b513b430c18e87 (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=b0859bc89b3514d10d98d5c8f9e27bc6b002e9d5
commit b0859bc89b3514d10d98d5c8f9e27bc6b002e9d5
Merge: c2f4bb5 e934b1f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jul 9 08:35:43 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jul 9 08:35:43 2013 -0400

    Merge topic 'doc-include-clarify' into next
    
    e934b1f include: Clarify variable access scope for included file


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e934b1f50359ae229015ad5453fee4df89ece055
commit e934b1f50359ae229015ad5453fee4df89ece055
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jul 9 08:28:13 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jul 9 08:31:23 2013 -0400

    include: Clarify variable access scope for included file
    
    The wording "Commands in the file are processed immediately as if they
    were written in place of the include command" sounds as if some kind of
    macro replacement is performed.  This is not accurate.  Update the
    wording to describe behavior of the included code in terms of the
    variable access scope.

diff --git a/Source/cmIncludeCommand.h b/Source/cmIncludeCommand.h
index c46c02d..d97b7c3 100644
--- a/Source/cmIncludeCommand.h
+++ b/Source/cmIncludeCommand.h
@@ -55,7 +55,7 @@ public:
    */
   virtual const char* GetTerseDocumentation() const
     {
-    return "Read CMake listfile code from the given file.";
+    return "Load and run CMake code from a file or module.";
     }
 
   /**
@@ -66,9 +66,10 @@ public:
     return
       "  include(<file|module> [OPTIONAL] [RESULT_VARIABLE <VAR>]\n"
       "                        [NO_POLICY_SCOPE])\n"
-      "Reads CMake listfile code from the given file.  Commands in the file "
-      "are processed immediately as if they were written in place of the "
-      "include command.  If OPTIONAL is present, then no error "
+      "Load and run CMake code from the file given.  "
+      "Variable reads and writes access the scope of the caller "
+      "(dynamic scoping).  "
+      "If OPTIONAL is present, then no error "
       "is raised if the file does not exist.  If RESULT_VARIABLE is given "
       "the variable will be set to the full filename which "
       "has been included or NOTFOUND if it failed.\n"

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

Summary of changes:
 Source/cmIncludeCommand.h |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake