diff options
| author | Brad King <brad.king@kitware.com> | 2022-03-08 21:02:46 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-03-08 21:03:14 (GMT) |
| commit | 11c25ae6aeeec94bcaad471a76ed0d76d30d8d8d (patch) | |
| tree | 073f7fa16d98f64654a898f7987674a2059297a3 /Help | |
| parent | ba695c87e16b7bdc3b1948bf3382d40585905da7 (diff) | |
| parent | f54507c2f6826e9b2b021dbf3b3fa75dcdce22fe (diff) | |
| download | CMake-11c25ae6aeeec94bcaad471a76ed0d76d30d8d8d.zip CMake-11c25ae6aeeec94bcaad471a76ed0d76d30d8d8d.tar.gz CMake-11c25ae6aeeec94bcaad471a76ed0d76d30d8d8d.tar.bz2 | |
Merge topic 'cmake-presets-file-dir' into release-3.23
f54507c2f6 CMakePresets.json: Add ${fileDir} macro
Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Acked-by: Gerhard Olsson <gerhard.nospam@gmail.com>
Merge-request: !7051
Diffstat (limited to 'Help')
| -rw-r--r-- | Help/manual/cmake-presets.7.rst | 5 | ||||
| -rw-r--r-- | Help/release/3.23.rst | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/Help/manual/cmake-presets.7.rst b/Help/manual/cmake-presets.7.rst index 4620984..03bb5aa 100644 --- a/Help/manual/cmake-presets.7.rst +++ b/Help/manual/cmake-presets.7.rst @@ -1053,6 +1053,11 @@ Recognized macros include: :variable:`CMAKE_HOST_SYSTEM_NAME`. This is allowed in preset files specifying version ``3`` or above. +``${fileDir}`` + + Path to the directory containing the preset file which contains the macro. + This is allowed in preset files specifying version ``4`` or above. + ``${dollar}`` A literal dollar sign (``$``). diff --git a/Help/release/3.23.rst b/Help/release/3.23.rst index b2928db..c3bee02 100644 --- a/Help/release/3.23.rst +++ b/Help/release/3.23.rst @@ -18,6 +18,9 @@ Presets * :manual:`cmake-presets(7)` files now have an optional ``include`` field, which allows the files to include other files. +* :manual:`cmake-presets(7)` files now support a ``${fileDir}`` macro, which + contains the directory containing the preset file. + * :manual:`cmake-presets(7)` gained support for specifying the ``resolvePackageReferences`` command line option in a build preset to control restoration behavior of package references from external package managers. |