| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
| |
06e6981 added support for optional binaryDir and generator, but
use the dependent preset's file version instead of the current
preset's file version. Check presets with their own file version
instead of their dependent's file version.
Fixes: #22428
|
|
|
|
|
|
|
|
| |
When resolving binaryDir into a full path from a relative path, we
forgot to check if binaryDir is altogether empty, causing empty
binaryDir's to resolve to the source directory. Fix this.
Fixes: #22434
|
|
|
|
|
| |
In v3 of the presets, the `--toolchain` command line argument now
has a preset mapping.
|
|
|
|
|
|
|
|
| |
In v3 of the presets, generator and buildDir can be omitted to fall
back to regular cmake behavior when these values are not explicitly
provided by the user.
Fixes: #21987
|
| |
|
| |
|
|
|
|
|
|
| |
This code is going to be needed by both cmCMakePresetsFile and
cmCMakePresetsFileReadJSON when the upcoming condition types are
created. Move it into a header file.
|
|
|
|
|
|
| |
Some compilers complain about translation units that are too large.
In order to prepare for upcoming additions to cmCMakePresetsFile,
split ReadJSON into a separate file.
|
|\
| |
| |
| |
| |
| |
| |
| |
| | |
bc663dc333 Merge branch 'master' into invalid-configure-preset
b9eb3541cf Tests: update tests to catch invalid configurePreset at read-time
83eeeff7dc Fail at read-time if configurePreset field invalid
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5912
|
| |\ |
|
| | | |
|
| | | |
|
| |/
|/| |
|
|/ |
|
|\ |
|
| |
| |
| |
| | |
Fixes: #21858
|
| |\
| | |
| | |
| | |
| | |
| | |
| | | |
64afabdbcb CMakePresets.json: Split cmakeGeneratorConfig field
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5387
|
| | |
| | |
| | |
| | | |
This was missed in the original implementation.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This was accidentally included after discussion in #21391 had decided to
leave it out. It was never included in a release.
Issue: #21391
|
| | |
| | |
| | |
| | | |
Fixes: #21391
|
| | | |
|
|\ \ \
| |/ /
|/| /
| |/
| |
| |
| | |
64afabdbcb CMakePresets.json: Split cmakeGeneratorConfig field
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5387
|
| |
| |
| |
| |
| |
| |
| |
| | |
Make this field separate for both architecture and toolset. Allow
architecture and toolset to be either strings or objects with value
and strategy fields.
Fixes: #21317
|
|/
|
|
| |
Fixes: #21312
|
|\
| |
| |
| |
| |
| |
| | |
638557cbfe CMakePresets.json: Properly report macro expansion errors
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5397
|
| |
| |
| |
| |
| |
| |
| |
| | |
Make a distinction between strings which simply use the
$vendor{<...>} macro, which is valid but makes it unusable by CMake,
and strings which actually contain invalid macro expansions.
Fixes: #21308
|
|/
|
|
| |
Fixes: #21327
|
| |
|
| |
|
|
|