[Cmake-commits] CMake branch, next, updated. v2.8.2-536-g5bff6e8

[David Cole]

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  5bff6e829404712d55e1becbf24657684839f723 (commit)
       via  9e62ac0b400c5aff953b74c8f8187ba9f4f71969 (commit)
      from  095fb5bf2d6184faa6997ac70991a6f13ad5eed8 (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=5bff6e829404712d55e1becbf24657684839f723
commit 5bff6e829404712d55e1becbf24657684839f723
Merge: 095fb5b 9e62ac0
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Wed Aug 25 15:26:07 2010 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Aug 25 15:26:07 2010 -0400

    Merge topic 'partial-fix-10743' into next
    
    9e62ac0 Improve documentation of OPTION command.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9e62ac0b400c5aff953b74c8f8187ba9f4f71969
commit 9e62ac0b400c5aff953b74c8f8187ba9f4f71969
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Wed Aug 25 15:23:18 2010 -0400
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Wed Aug 25 15:23:18 2010 -0400

    Improve documentation of OPTION command.
    
    Point via see also phrasing to the CMakeDependentOption module.

diff --git a/Source/cmOptionCommand.h b/Source/cmOptionCommand.h
index 8670fc4..fa5abd8 100644
--- a/Source/cmOptionCommand.h
+++ b/Source/cmOptionCommand.h
@@ -59,7 +59,10 @@ public:
       "  option(<option_variable> \"help string describing option\"\n"
       "         [initial value])\n"
       "Provide an option for the user to select as ON or OFF.  If no "
-      "initial value is provided, OFF is used.";
+      "initial value is provided, OFF is used.\n"
+      "If you have options that depend on the values of other "
+      "options, see the module help for CMakeDependentOption."
+      ;
     }
 
   /**

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

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


hooks/post-receive
-- 
CMake