Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes conflict between -DCMAKE_GENERATOR:STRING=Ninja and -G "Visual Studio 16 2019" -A x64 #1753

Merged
merged 3 commits into from
May 4, 2021

Conversation

lygstate
Copy link
Contributor

@lygstate lygstate commented Apr 11, 2021

If we have both "-DCMAKE_GENERATOR:STRING=" and the generator from
toolchain, prefre using "-DCMAKE_GENERATOR:STRING=", as
"-DCMAKE_GENERATOR:STRING=" can be defined by different cmake-variants.yaml

This resolve the conflict between
`-DCMAKE_GENERATOR:STRING=Ninja` and `-G "Visual Studio 16 2019" -A x64`

toolchain, prefre using "-DCMAKE_GENERATOR:STRING=", as
"-DCMAKE_GENERATOR:STRING=" can be defined by different cmake-variants.yaml

Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
@bobbrow bobbrow added this to the 1.8.0 milestone Apr 12, 2021
xisui-MSFT
xisui-MSFT previously approved these changes Apr 14, 2021
@xisui-MSFT xisui-MSFT dismissed their stale review April 14, 2021 18:07

Currently only approving PRs for 1.7

@lygstate lygstate changed the title Improve generator command line for cmake Improve generator command line for visual studio 2015 and Ninja Apr 22, 2021
@lygstate
Copy link
Contributor Author

@bobbrow Hi this fixes a issue , hopt it merged in 1.7.1

@lygstate lygstate changed the title Improve generator command line for visual studio 2015 and Ninja Fixes conflict between -DCMAKE_GENERATOR:STRING=Ninja and -G "Visual Studio 16 2019" -A x64 Apr 22, 2021
@bobbrow
Copy link
Member

bobbrow commented Apr 26, 2021

Thank you for all of the PR's @lygstate. 1.7.1 was primarily a patch for a critical issue and we didn't have time to assess your PR's. I think we will do a 1.7.2 with another patch for CMake Presets next week so we may be able to get some of these open PR's into that.

@andreeis andreeis modified the milestones: 1.8.0, 1.7.2 Apr 28, 2021
@andreeis andreeis merged commit e67d8c1 into microsoft:develop May 4, 2021
@andreeis
Copy link
Contributor

andreeis commented May 4, 2021

@lygstate, your contribution is included in 1.7.2 which will release in a few days. If you would like, you can try this vsix (https://github.com/microsoft/vscode-cmake-tools/actions/runs/811030625) to get this support before we release 1.7.2.

andreeis added a commit that referenced this pull request May 6, 2021
* Fix typo in CMakePresets.json schema (#1809)

MinSizRel => MinSizeRel

* update version to 1.7.2

* Localize an error message

* Added counts for presets (#1819)

* override the locale when querying compiler versions (#1824)

* Adopt new localization process (#1831)

* Fix Operator Precedence when Getting Code Page (#1808)

The replacing should happen after the "??" operator.

Fixes #1615

Co-authored-by: Andreea Isac <48239328+andreeis@users.noreply.github.com>

* If we have both "-DCMAKE_GENERATOR:STRING=" and the generator from (#1753)

toolchain, prefre using "-DCMAKE_GENERATOR:STRING=", as
"-DCMAKE_GENERATOR:STRING=" can be defined by different cmake-variants.yaml

Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>

Co-authored-by: Andreea Isac <48239328+andreeis@users.noreply.github.com>

* Use stricter type checks in presets expansion (#1818)

* Use stricter type checks in presets expansion

* Resolving comments

Co-authored-by: Andreea Isac <48239328+andreeis@users.noreply.github.com>

* Fix paths of target sources outside the workspace (#1816)

* Fix paths of target sources outside the workspace

For more details, see:
#1504

* Add test for source files outside of workspace root

Co-Authored-By: Elson Wei <elson.wei@gmail.com>

Co-authored-by: Elson Wei <elson.wei@gmail.com>
Co-authored-by: Bob Brown <bobbrow@users.noreply.github.com>

* CHANGELOG updates for 1.7.2 (#1837)

Co-authored-by: BlueC0re <bluec0re@users.noreply.github.com>
Co-authored-by: Bob Brown <bobbrow@users.noreply.github.com>
Co-authored-by: Bob Brown (DEVDIV) <bobbrow@microsoft.com>
Co-authored-by: xisui-MSFT <44103947+xisui-MSFT@users.noreply.github.com>
Co-authored-by: Colen Garoutte-Carson <49173979+Colengms@users.noreply.github.com>
Co-authored-by: Huang, Zhaoquan <zhaoquan2008@hotmail.com>
Co-authored-by: Yonggang Luo <luoyonggang@gmail.com>
Co-authored-by: Simon Leiner <sleiner@users.noreply.github.com>
Co-authored-by: Elson Wei <elson.wei@gmail.com>
@lygstate lygstate deleted the custom-generator branch May 7, 2021 01:32
@github-actions github-actions bot locked and limited conversation to collaborators Jan 29, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants