cmake presets with VS and ninja and improved merge #11666
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Co-authored-by: James <james@conan.io>
…to feature/presets_schema_2
… into feature/cmake_presets_ninja
… into feature/cmake_presets_ninja
lasote
changed the title
lasote
changed the title
lasote
commented
Jul 19, 2022
| from conans.errors import ConanException | ||
| from conans.util.files import save, load | ||
|
|
||
|
|
||
| def _add_build_preset(conanfile, multiconfig): | ||
| def _build_preset(conanfile, multiconfig): |
There was a problem hiding this comment.
this is only a rename
lasote
commented
Jul 19, 2022
| @@ -42,7 +43,7 @@ def _configure_preset_name(conanfile, multiconfig): | |||
| return str(build_type).lower() | |||
|
|
|||
|
|
|||
| def _add_configure_preset(conanfile, generator, cache_variables, toolchain_file, multiconfig): | |||
| def _configure_preset(conanfile, generator, cache_variables, toolchain_file, multiconfig): | |||
lasote
commented
Jul 19, 2022
| if b["name"] == new_build_preset_name]) | ||
| if not already_exist: | ||
| data["buildPresets"].append(_add_build_preset(conanfile, multiconfig)) | ||
| build_preset = _build_preset(conanfile, multiconfig) |
There was a problem hiding this comment.
The below code was a bug, previously I only appended a preset if it didn't exist, but it might be changed, it is needed to overwrite it, so now I search the index and update.
lasote
changed the title
memsharded
approved these changes
Jul 19, 2022
franramirez688
approved these changes
Jul 22, 2022
1 task
1 task
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changelog: Feature: The
CMakePreset.jsonnow containstoolsetandarchitectureitems when usingNinjagenerator andmsvccompiler so the IDE (Visual Studio) can set the correct compiler (vcvars) automatically.Docs: omit
Close #11623