summaryrefslogtreecommitdiffstats
path: root/Help/manual
diff options
context:
space:
mode:
authorCraig Scott <craig.scott@crascit.com>2021-08-02 08:54:27 (GMT)
committerKitware Robot <kwrobot@kitware.com>2021-08-02 08:54:49 (GMT)
commitbc44c32773909f6b1d8100e4249caa93385008bf (patch)
tree0957b5bd12630c200a554e0cb488f8cbe8f080bf /Help/manual
parent09217f2779f688779cde33a81d7167acf14ed3ee (diff)
parentca371d3a144ea761485e0f1846b8c215e7db19fa (diff)
downloadCMake-bc44c32773909f6b1d8100e4249caa93385008bf.zip
CMake-bc44c32773909f6b1d8100e4249caa93385008bf.tar.gz
CMake-bc44c32773909f6b1d8100e4249caa93385008bf.tar.bz2
Merge topic 'doc-presets-toolchain-file'
ca371d3a14 Help: Fix unlinked mention of CMAKE_TOOLCHAIN_FILE Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6417
Diffstat (limited to 'Help/manual')
-rw-r--r--Help/manual/cmake-presets.7.rst5
1 files changed, 3 insertions, 2 deletions
diff --git a/Help/manual/cmake-presets.7.rst b/Help/manual/cmake-presets.7.rst
index db26b5a..74e9fae 100644
--- a/Help/manual/cmake-presets.7.rst
+++ b/Help/manual/cmake-presets.7.rst
@@ -187,8 +187,9 @@ that may contain the following fields:
An optional string representing the path to the toolchain file.
This field supports `macro expansion`_. If a relative path is specified,
it is calculated relative to the build directory, and if not found,
- relative to the source directory. Takes precedence over any `CMAKE_TOOLCHAIN_FILE`
- value. This is allowed in preset files specifying version ``3`` or above.
+ relative to the source directory. This field takes precedence over any
+ :variable:`CMAKE_TOOLCHAIN_FILE` value. It is allowed in preset files
+ specifying version ``3`` or above.
``binaryDir``