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 abcab61f7ec66715040b67fb42b04aec43cdff92 (commit) via b0ea36730847695c5e9579de92e7dd4272cfc27a (commit) from 86ad0abe63dadf14f565bf600fe0483e7cdb5540 (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=abcab61f7ec66715040b67fb42b04aec43cdff92 commit abcab61f7ec66715040b67fb42b04aec43cdff92 Merge: 86ad0ab b0ea367 Author: Brad King <brad.k...@kitware.com> AuthorDate: Wed May 20 08:38:53 2015 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Wed May 20 08:38:53 2015 -0400 Merge topic 'doc-cache-option-space' into next b0ea3673 Help: Spell '-D' option consistently across documentation (#15575) http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b0ea36730847695c5e9579de92e7dd4272cfc27a commit b0ea36730847695c5e9579de92e7dd4272cfc27a Author: Brad King <brad.k...@kitware.com> AuthorDate: Wed May 20 08:30:36 2015 -0400 Commit: Brad King <brad.k...@kitware.com> CommitDate: Wed May 20 08:30:36 2015 -0400 Help: Spell '-D' option consistently across documentation (#15575) Always show the option with its argument separate in summary text. State in the main documentation that the option and its argument can be given together too. diff --git a/Help/manual/OPTIONS_BUILD.txt b/Help/manual/OPTIONS_BUILD.txt index e4c5873..4207db4 100644 --- a/Help/manual/OPTIONS_BUILD.txt +++ b/Help/manual/OPTIONS_BUILD.txt @@ -27,6 +27,9 @@ command in the project sets the type to ``PATH`` or ``FILEPATH`` then the ``<value>`` will be converted to an absolute path. + This option may also be given as a single argument: + ``-D<var>:<type>=<value>`` or ``-D<var>=<value>``. + ``-U <globbing_expr>`` Remove matching entries from CMake cache. diff --git a/Help/manual/cmake.1.rst b/Help/manual/cmake.1.rst index b2f7e9d..4bd5a5e 100644 --- a/Help/manual/cmake.1.rst +++ b/Help/manual/cmake.1.rst @@ -9,7 +9,7 @@ Synopsis .. parsed-literal:: cmake [<options>] (<path-to-source> | <path-to-existing-build>) - cmake [(-D<var>=<value>)...] -P <cmake-script-file> + cmake [(-D <var>=<value>)...] -P <cmake-script-file> cmake --build <dir> [<options>] [-- <build-tool-options>...] cmake -E <command> [<options>...] cmake --find-package <options>... diff --git a/Source/cmake.h b/Source/cmake.h index 0d1977e..0a1ee7d 100644 --- a/Source/cmake.h +++ b/Source/cmake.h @@ -403,7 +403,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 a cmake cache entry."}, \ {"-U <globbing_expr>", "Remove matching entries from CMake cache."}, \ {"-G <generator-name>", "Specify a build system generator."},\ {"-T <toolset-name>", "Specify toolset name if supported by generator."}, \ ----------------------------------------------------------------------- Summary of changes: Help/manual/OPTIONS_BUILD.txt | 3 +++ Help/manual/cmake.1.rst | 2 +- Source/cmake.h | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits