[Cmake-commits] CMake branch, next, updated. v3.1.0-1519-g1c85c60

[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  1c85c606fd9c5f39ce8ab254cbc7b631bd250271 (commit)
       via  7a2c3f0c0ec5b542c89456826adeb56c3cbd7df0 (commit)
      from  f2ff942e6346e0e689dec36f440de3beb512f799 (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=1c85c606fd9c5f39ce8ab254cbc7b631bd250271
commit 1c85c606fd9c5f39ce8ab254cbc7b631bd250271
Merge: f2ff942 7a2c3f0
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 8 13:45:27 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 8 13:45:27 2015 -0500

    Merge topic 'doc-if-variable-not-defined' into next
    
    7a2c3f0c Help: Clarify if(<variable>) documentation (#15335)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7a2c3f0c0ec5b542c89456826adeb56c3cbd7df0
commit 7a2c3f0c0ec5b542c89456826adeb56c3cbd7df0
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 8 13:36:11 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jan 8 13:43:40 2015 -0500

    Help: Clarify if(<variable>) documentation (#15335)
    
    When the variable is not defined the signature is actually accepting
    a string.  Also clarify fall-through from if(<constant>) case.

diff --git a/Help/command/if.rst b/Help/command/if.rst
index 79e5d21..d50b14c 100644
--- a/Help/command/if.rst
+++ b/Help/command/if.rst
@@ -42,11 +42,12 @@ Possible expressions are:
  or a non-zero number.  False if the constant is ``0``, ``OFF``,
  ``NO``, ``FALSE``, ``N``, ``IGNORE``, ``NOTFOUND``, the empty string,
  or ends in the suffix ``-NOTFOUND``.  Named boolean constants are
- case-insensitive.  If the argument is not one of these constants, it
- is treated as a variable.
+ case-insensitive.  If the argument is not one of these specific
+ constants, it is treated as a variable or string and the following
+ signature is used.
 
-``if(<variable>)``
- True if the variable is defined to a value that is not a false
+``if(<variable|string>)``
+ True if given a variable that is defined to a value that is not a false
  constant.  False otherwise.  (Note macro arguments are not variables.)
 
 ``if(NOT <expression>)``

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

Summary of changes:
 Help/command/if.rst |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake