[Cmake-commits] CMake branch, master, updated. v3.11.2-839-g3cc0816

[Kitware Robot]

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, master has been updated
       via  3cc081654dd79ea17692ecd3ae647e1d155a2dce (commit)
       via  42738e50757ba93635dc66148cace7999c89521a (commit)
      from  caab746548908adf381dcf73803cdf508e28693c (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3cc081654dd79ea17692ecd3ae647e1d155a2dce
commit 3cc081654dd79ea17692ecd3ae647e1d155a2dce
Merge: caab746 42738e5
Author:     Craig Scott <craig.scott at crascit.com>
AuthorDate: Sun May 27 08:40:25 2018 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Sun May 27 04:40:34 2018 -0400

    Merge topic 'cmake-D-option-help'
    
    42738e5075 Help: Update description of the -D option to CMake
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !2105


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=42738e50757ba93635dc66148cace7999c89521a
commit 42738e50757ba93635dc66148cace7999c89521a
Author:     Raul Laasner <raullaasner at gmail.com>
AuthorDate: Thu May 24 14:01:57 2018 -0400
Commit:     Raul Laasner <raullaasner at gmail.com>
CommitDate: Thu May 24 17:50:33 2018 -0400

    Help: Update description of the -D option to CMake
    
    Fixes #18021

diff --git a/Help/manual/OPTIONS_BUILD.txt b/Help/manual/OPTIONS_BUILD.txt
index e8b87c9..33d27af 100644
--- a/Help/manual/OPTIONS_BUILD.txt
+++ b/Help/manual/OPTIONS_BUILD.txt
@@ -11,7 +11,7 @@
  cache-format file.
 
 ``-D <var>:<type>=<value>, -D <var>=<value>``
- Create a cmake cache entry.
+ Create or update a cmake cache entry.
 
  When cmake is first run in an empty build tree, it creates a
  CMakeCache.txt file and populates it with customizable settings for
diff --git a/Source/cmake.h b/Source/cmake.h
index 63dbe9f..dafe622 100644
--- a/Source/cmake.h
+++ b/Source/cmake.h
@@ -550,7 +550,7 @@ private:
 
 #define CMAKE_STANDARD_OPTIONS_TABLE                                          \
   { "-C <initial-cache>", "Pre-load a script to populate the cache." },       \
-    { "-D <var>[:<type>]=<value>", "Create a cmake cache entry." },           \
+    { "-D <var>[:<type>]=<value>", "Create or update a cmake cache entry." }, \
     { "-U <globbing_expr>", "Remove matching entries from CMake cache." },    \
     { "-G <generator-name>", "Specify a build system generator." },           \
     { "-T <toolset-name>",                                                    \

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

Summary of changes:
 Help/manual/OPTIONS_BUILD.txt |    2 +-
 Source/cmake.h                |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake