diff options
| author | Brad King <brad.king@kitware.com> | 2018-05-04 15:04:43 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-05-04 15:04:53 (GMT) |
| commit | 5e5ef61ed3b5808dfe1a71623ec12c451d7fe385 (patch) | |
| tree | 99017ff184ef0cc60ef80149d7d5a69faaec0782 | |
| parent | fc35e817ee243d31c5846d09b0b21f2756a0727b (diff) | |
| parent | 828e18bb3eadaff9bbe8b1ddf57b68cf40e0eafb (diff) | |
| download | CMake-5e5ef61ed3b5808dfe1a71623ec12c451d7fe385.zip CMake-5e5ef61ed3b5808dfe1a71623ec12c451d7fe385.tar.gz CMake-5e5ef61ed3b5808dfe1a71623ec12c451d7fe385.tar.bz2 | |
Merge topic 'doc-xref-envvar'
828e18bb3e cmRST: Add support for 'envvar' cmake domain role
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2038
| -rw-r--r-- | Source/cmRST.cxx | 2 | ||||
| -rw-r--r-- | Tests/CMakeLib/testRST.expect | 2 | ||||
| -rw-r--r-- | Tests/CMakeLib/testRST.rst | 2 |
3 files changed, 5 insertions, 1 deletions
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 |