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 5e5ef61ed3b5808dfe1a71623ec12c451d7fe385 (commit) via 828e18bb3eadaff9bbe8b1ddf57b68cf40e0eafb (commit) from fc35e817ee243d31c5846d09b0b21f2756a0727b (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=5e5ef61ed3b5808dfe1a71623ec12c451d7fe385 commit 5e5ef61ed3b5808dfe1a71623ec12c451d7fe385 Merge: fc35e81 828e18b Author: Brad King <brad.k...@kitware.com> AuthorDate: Fri May 4 15:04:43 2018 +0000 Commit: Kitware Robot <kwro...@kitware.com> CommitDate: Fri May 4 11:04:53 2018 -0400 Merge topic 'doc-xref-envvar' 828e18bb3e cmRST: Add support for 'envvar' cmake domain role Acked-by: Kitware Robot <kwro...@kitware.com> Merge-request: !2038 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=828e18bb3eadaff9bbe8b1ddf57b68cf40e0eafb commit 828e18bb3eadaff9bbe8b1ddf57b68cf40e0eafb Author: Brad King <brad.k...@kitware.com> AuthorDate: Thu May 3 14:34:32 2018 -0400 Commit: Brad King <brad.k...@kitware.com> CommitDate: Fri May 4 07:52:14 2018 -0400 cmRST: Add support for 'envvar' cmake domain role This was accidentally left out of commit 8acf46caf1 (Utilities/Sphinx: Add role and directive for 'envvar' in CMake domain, 2018-04-19). diff --git a/Source/cmRST.cxx b/Source/cmRST.cxx index 112be4d..edcbc22 100644 --- a/Source/cmRST.cxx +++ b/Source/cmRST.cxx @@ -34,7 +34,7 @@ cmRST::cmRST(std::ostream& os, std::string const& docroot) , NoteDirective("^.. note::[ \t]*(.*)$") , ModuleRST("^#\\[(=*)\\[\\.rst:$") , CMakeRole("(:cmake)?:(" - "command|generator|variable|module|policy|" + "command|generator|variable|envvar|module|policy|" "prop_cache|prop_dir|prop_gbl|prop_inst|prop_sf|" "prop_test|prop_tgt|" "manual" diff --git a/Tests/CMakeLib/testRST.expect b/Tests/CMakeLib/testRST.expect index fa436cb..4b29762 100644 --- a/Tests/CMakeLib/testRST.expect +++ b/Tests/CMakeLib/testRST.expect @@ -16,6 +16,8 @@ Variable ``<PLACEHOLDER>_VARIABLE`` with leading placeholder. Variable ``VARIABLE_<PLACEHOLDER>`` with trailing placeholder. Variable ``<PLACEHOLDER>_VARIABLE`` with leading placeholder and target. Variable ``VARIABLE_<PLACEHOLDER>`` with trailing placeholder and target. +Environment variable ``SOME_ENV_VAR``. +Environment variable ``some env var`` with space and target. Generator ``Some Generator`` with space. First TOC entry. diff --git a/Tests/CMakeLib/testRST.rst b/Tests/CMakeLib/testRST.rst index 54952dd..9cd7257 100644 --- a/Tests/CMakeLib/testRST.rst +++ b/Tests/CMakeLib/testRST.rst @@ -23,6 +23,8 @@ Variable :variable:`<PLACEHOLDER>_VARIABLE` with leading placeholder. Variable :variable:`VARIABLE_<PLACEHOLDER>` with trailing placeholder. Variable :variable:`<PLACEHOLDER>_VARIABLE <target>` with leading placeholder and target. Variable :variable:`VARIABLE_<PLACEHOLDER> <target>` with trailing placeholder and target. +Environment variable :envvar:`SOME_ENV_VAR`. +Environment variable :envvar:`some env var <SOME_ENV_VAR>` with space and target. Generator :generator:`Some Generator` with space. .. |not replaced| replace:: not replaced through toctree ----------------------------------------------------------------------- Summary of changes: Source/cmRST.cxx | 2 +- Tests/CMakeLib/testRST.expect | 2 ++ Tests/CMakeLib/testRST.rst | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits