diff options
| author | Brad King <brad.king@kitware.com> | 2021-05-04 15:54:41 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-05-04 15:54:49 (GMT) |
| commit | 09f2f5df89a72d8394bdc21de0c1f599fdbbb27a (patch) | |
| tree | 9cdfe8518fe4733973158cd3a4267757d357dc33 /Help | |
| parent | abc78a35578de4260f497ecd924ca3323fb17604 (diff) | |
| parent | a9b968bb9894902e2183a4aea4c23701d5666733 (diff) | |
| download | CMake-09f2f5df89a72d8394bdc21de0c1f599fdbbb27a.zip CMake-09f2f5df89a72d8394bdc21de0c1f599fdbbb27a.tar.gz CMake-09f2f5df89a72d8394bdc21de0c1f599fdbbb27a.tar.bz2 | |
Merge topic 'extend_toolchain_flag_to_cmake_preset'
a9b968bb98 cmake-presets: Introduce `toolchainFile` preset option
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6045
Diffstat (limited to 'Help')
| -rw-r--r-- | Help/manual/cmake-presets.7.rst | 8 | ||||
| -rw-r--r-- | Help/manual/presets/schema.json | 5 |
2 files changed, 13 insertions, 0 deletions
diff --git a/Help/manual/cmake-presets.7.rst b/Help/manual/cmake-presets.7.rst index 3714004..57c8ccf 100644 --- a/Help/manual/cmake-presets.7.rst +++ b/Help/manual/cmake-presets.7.rst @@ -182,6 +182,14 @@ that may contain the following fields: ignore the field, but the IDE can use them to set up the environment before invoking CMake. +``toolchainFile`` + + 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. + ``binaryDir`` An optional string representing the path to the output binary directory. diff --git a/Help/manual/presets/schema.json b/Help/manual/presets/schema.json index a69d270..767e80b 100644 --- a/Help/manual/presets/schema.json +++ b/Help/manual/presets/schema.json @@ -87,6 +87,10 @@ "type": "string", "description": "An optional string representing the generator to use for the preset. If generator is not specified, the normal generator discovery procedure is used. Note that for Visual Studio generators, unlike in the command line -G argument, you cannot include the platform name in the generator name. Use the architecture field instead." }, + "toolchainFile": { + "type": "string", + "description": "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." + }, "installDir": { "type": "string", "description": "An optional string representing the path to the installation directory. This field supports macro expansion. If a relative path is specified, it is calculated relative to the source directory." @@ -360,6 +364,7 @@ "generator": {}, "architecture": {}, "toolset": {}, + "toolchainFile": {}, "binaryDir": {}, "installDir": {}, "cmakeExecutable": {}, |