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

Accept v140 and VS 15.0 for CMake generator (#5318) #5321

Merged

Conversation

@uilianries
Copy link
Member

@uilianries uilianries commented Jun 8, 2019

fixes #5318

Changelog: Fix: Accept v140 and VS 15.0 for CMake generator (#5318)
Docs: Omit

  • Refer to the issue that supports this Pull Request.
  • If the issue has missing info, explain the purpose/use case/pain/need that covers this Pull Request.
  • I've read the Contributing guide.
  • I've followed the PEP8 style guides for Python code.
  • I've opened another PR in the Conan docs repo to the develop branch, documenting this one.

Note: By default this PR will skip the slower tests and will use a limited set of python versions. Check here how to increase the testing level by writing some tags in the current PR body text.

@memsharded memsharded changed the base branch from develop to release/1.16.1 Jun 9, 2019
@memsharded memsharded changed the base branch from release/1.16.1 to develop Jun 9, 2019
Copy link
Member

@memsharded memsharded left a comment

Please do the PR to release/1.16.1 branch

@memsharded memsharded added this to the 1.16.1 milestone Jun 9, 2019
@uilianries uilianries changed the base branch from develop to release/1.16.1 Jun 9, 2019
Signed-off-by: Uilian Ries <uilianries@gmail.com>
@uilianries uilianries force-pushed the hotfix/msvs2017-v140 branch from 7a1544d to c90bbfa Jun 9, 2019
@uilianries
Copy link
Member Author

@uilianries uilianries commented Jun 9, 2019

Forced push because I moved the base branch from develop to release/1.16.1

@memsharded memsharded merged commit fa70d25 into conan-io:release/1.16.1 Jun 9, 2019
2 checks passed
@memsharded
Copy link
Member

@memsharded memsharded commented Jun 9, 2019

Many thanks @uilianries !

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants