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 for GitHub issues 964 and 1084 #1162

Merged
merged 9 commits into from
Apr 17, 2020
Merged

Conversation

andreeis
Copy link
Contributor

@andreeis andreeis commented Apr 7, 2020

Fix for GitHub issue #1084:
Remove the default values for cmake.prefferedGenerators in package.json and use them later, only if the deduction process is not identifying any. Without this fix, Ninja and Unix Makefiles would always be preferred (when installed), when the user would not override these defaults in the settings and regardless of the preferred generator defined for the kit.

Fix for GitHub issue #964:
Always generate the VS kits with full information about the platforms, no defaults.
VS architecture becomes host architecture and is the arch before "".
Target architecture is the arch after "
".
If no "_" is present in the end of the kit name, then the one architecture applies for host and target.

I am investigating some test failures (probably only baseline changes) but I am submitting the PR before, to get results also from the CI.

.vscode/launch.json Outdated Show resolved Hide resolved
src/kit.ts Outdated Show resolved Hide resolved
src/kit.ts Outdated Show resolved Hide resolved
src/kit.ts Outdated Show resolved Hide resolved
src/kit.ts Outdated Show resolved Hide resolved
src/kit.ts Outdated Show resolved Hide resolved
src/kit.ts Outdated Show resolved Hide resolved
@bobbrow
Copy link
Member

bobbrow commented Apr 10, 2020

Please double-check my merge. There was a conflict with another feature that was recently submitted.

package.json Outdated
"ts-loader": "^6.0.4",
"ts-node": "^6.0.0",
"ts-loader": "^6.2.2",
"ts-node": "^8.8.1",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This new version of ts-node seems to be causing the build to fail on linux. Can you please fix it or revert the change?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I saw your update, but the build still fails. Unfortunately, I don't think this was fixed.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes I just saw it fails. I am trying reverting next.

@bobbrow bobbrow merged commit b4622a9 into develop Apr 17, 2020
@bobbrow bobbrow deleted the dev/andris/cmake_tools/github964 branch April 17, 2020 21:04
@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.

2 participants