diff options
| author | Craig Scott <craig.scott@crascit.com> | 2018-05-27 08:40:25 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-05-27 08:40:34 (GMT) |
| commit | 3cc081654dd79ea17692ecd3ae647e1d155a2dce (patch) | |
| tree | 2efbb06f5a9b6a4045c1c944bb7669326fb068c5 | |
| parent | caab746548908adf381dcf73803cdf508e28693c (diff) | |
| parent | 42738e50757ba93635dc66148cace7999c89521a (diff) | |
| download | CMake-3cc081654dd79ea17692ecd3ae647e1d155a2dce.zip CMake-3cc081654dd79ea17692ecd3ae647e1d155a2dce.tar.gz CMake-3cc081654dd79ea17692ecd3ae647e1d155a2dce.tar.bz2 | |
Merge topic 'cmake-D-option-help'
42738e5075 Help: Update description of the -D option to CMake
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2105
| -rw-r--r-- | Help/manual/OPTIONS_BUILD.txt | 2 | ||||
| -rw-r--r-- | Source/cmake.h | 2 |
2 files changed, 2 insertions, 2 deletions
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>", \ |