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 52d9cd624fc0da9b26fd677d92e67dd033603337 (commit) via a09d14bbce9b68f9249b0d2698c3de7eb4114143 (commit) via 493b8eae369977530294ab243b0cc2215a243a81 (commit) via d192caefff3a0a750c7ab86582b08b2b98142f08 (commit) from fdaad9a067e8fa55816d9cef2481450fc5b1f18b (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=52d9cd624fc0da9b26fd677d92e67dd033603337 commit 52d9cd624fc0da9b26fd677d92e67dd033603337 Merge: a09d14b 493b8ea Author: Brad King <brad.k...@kitware.com> AuthorDate: Tue Aug 6 13:57:39 2019 +0000 Commit: Kitware Robot <kwro...@kitware.com> CommitDate: Tue Aug 6 09:58:25 2019 -0400 Merge topic 'doc-fix-CMAKE_MESSAGE_INDENT-sample-output' 493b8eae36 Help: Fix example output in the `CMAKE_MESSAGE_INDENT` documentation Acked-by: Kitware Robot <kwro...@kitware.com> Merge-request: !3651 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a09d14bbce9b68f9249b0d2698c3de7eb4114143 commit a09d14bbce9b68f9249b0d2698c3de7eb4114143 Merge: fdaad9a d192cae Author: Brad King <brad.k...@kitware.com> AuthorDate: Tue Aug 6 13:57:10 2019 +0000 Commit: Kitware Robot <kwro...@kitware.com> CommitDate: Tue Aug 6 09:57:19 2019 -0400 Merge topic 'cmake-dependent-option-doc' d192caefff CMakeDependentOption: Document that 4th parameter follows if-syntax Acked-by: Kitware Robot <kwro...@kitware.com> Merge-request: !3643 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=493b8eae369977530294ab243b0cc2215a243a81 commit 493b8eae369977530294ab243b0cc2215a243a81 Author: Alex Turbov <i.za...@gmail.com> AuthorDate: Mon Aug 5 18:17:46 2019 +0300 Commit: Alex Turbov <i.za...@gmail.com> CommitDate: Mon Aug 5 18:17:46 2019 +0300 Help: Fix example output in the `CMAKE_MESSAGE_INDENT` documentation diff --git a/Help/variable/CMAKE_MESSAGE_INDENT.rst b/Help/variable/CMAKE_MESSAGE_INDENT.rst index f7975ab..d502121 100644 --- a/Help/variable/CMAKE_MESSAGE_INDENT.rst +++ b/Help/variable/CMAKE_MESSAGE_INDENT.rst @@ -23,6 +23,8 @@ Example: Which results in the following output: +.. code-block:: none + -- Collected items in the "listVar": -- one -- two https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d192caefff3a0a750c7ab86582b08b2b98142f08 commit d192caefff3a0a750c7ab86582b08b2b98142f08 Author: Hong Xu <h...@topbug.net> AuthorDate: Fri Aug 2 13:30:39 2019 -0700 Commit: Brad King <brad.k...@kitware.com> CommitDate: Mon Aug 5 10:15:21 2019 -0400 CMakeDependentOption: Document that 4th parameter follows if-syntax diff --git a/Help/command/if.rst b/Help/command/if.rst index d8e3a45..be992df 100644 --- a/Help/command/if.rst +++ b/Help/command/if.rst @@ -29,6 +29,8 @@ If used, it must be a verbatim repeat of the argument of the opening ``if`` command. +.. _`Condition Syntax`: + Condition Syntax ^^^^^^^^^^^^^^^^ diff --git a/Modules/CMakeDependentOption.cmake b/Modules/CMakeDependentOption.cmake index 6046d85..99d5070 100644 --- a/Modules/CMakeDependentOption.cmake +++ b/Modules/CMakeDependentOption.cmake @@ -12,7 +12,7 @@ conditions are true. When the option is not presented a default value is used, but any value set by the user is preserved for when the option is presented again. Example invocation: -:: +.. code-block:: cmake CMAKE_DEPENDENT_OPTION(USE_FOO "Use Foo" ON "USE_BAR;NOT USE_ZOT" OFF) @@ -21,7 +21,8 @@ If USE_BAR is true and USE_ZOT is false, this provides an option called USE_FOO that defaults to ON. Otherwise, it sets USE_FOO to OFF. If the status of USE_BAR or USE_ZOT ever changes, any value for the USE_FOO option is saved so that when the option is re-enabled it -retains its old value. +retains its old value. Each element in the fourth parameter is +evaluated as an if-condition, so :ref:`Condition Syntax` can be used. #]=======================================================================] macro(CMAKE_DEPENDENT_OPTION option doc default depends force) ----------------------------------------------------------------------- Summary of changes: Help/command/if.rst | 2 ++ Help/variable/CMAKE_MESSAGE_INDENT.rst | 2 ++ Modules/CMakeDependentOption.cmake | 5 +++-- 3 files changed, 7 insertions(+), 2 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits