-
Notifications
You must be signed in to change notification settings - Fork 1.8k
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
libvpx: add support for msvc17 193 #15607
Conversation
recipes/libvpx/all/conanfile.py
Outdated
@@ -160,7 +160,7 @@ def _execute_configure(self): | |||
elif is_msvc(self): | |||
vc_version = str(self.settings.compiler.version) | |||
if Version(self.settings.compiler.version) > "100": # New msvc compiler to triplet used in configure script for vpx | |||
vc_version = {"190": "14", "191": "15", "192": "16"}[vc_version] | |||
vc_version = {"190": "14", "191": "15", "192": "16", "193": "17"}[vc_version] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
vc_version = {"190": "14", "191": "15", "192": "16", "193": "17"}[vc_version] | |
vc_version = {"170": "11", "180": "12", "190": "14", "191": "15", "192": "16", "193": "17"}[vc_version] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could you also remove this ConanInvalidConfiguration you have added in last PR at the end of this branching? ConanInvalidConfiguration should only be called in validate() and there is already a logic in validate() checking that we cannot use other compilers not managed be current logic in _execute_configure()
.
It's something I've removed long time ago in #6405, I don't understand why this broken logic has been restored. Raise a ConanException if you want, but it's just defensive programming since by recipe design in validate(), conan can't go into this branch.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ok good point :)
recipes/libvpx/all/conanfile.py
Outdated
@@ -160,7 +160,7 @@ def _execute_configure(self): | |||
elif is_msvc(self): | |||
vc_version = str(self.settings.compiler.version) | |||
if Version(self.settings.compiler.version) > "100": # New msvc compiler to triplet used in configure script for vpx |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What does it mean? This if
is useless, you already know that you are in the compiler=msvc
case because compiler == "Visual Studio" has been tested first.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
True!
This comment has been minimized.
This comment has been minimized.
Co-authored-by: SpaceIm <30052553+SpaceIm@users.noreply.github.com>
Conan v1 pipeline ✔️All green in build 3 (
Conan v2 pipeline (informative, not required for merge) ❌
The v2 pipeline failed. Please, review the errors and note this will be required for pull requests to be merged in the near future. See details:Failure in build 3 (
Note: To save resources, CI tries to finish as soon as an error is found. For this reason you might find that not all the references have been launched or not all the configurations for a given reference. Also, take into account that we cannot guarantee the order of execution as it depends on CI workload and workers availability. |
* libvpx: add support for msvc17 193 * Update recipes/libvpx/all/conanfile.py Co-authored-by: SpaceIm <30052553+SpaceIm@users.noreply.github.com> * Remove useless tests - already checked in validate() --------- Co-authored-by: SpaceIm <30052553+SpaceIm@users.noreply.github.com>
A simple patch to add support for MSVC17
A quick and simple follow-up to #13799