Fix: use self._run instead of self._conanfile.run to ensure vcvars apply for Ninja/NMake generators - #3803
Merged
Conversation
SSE4
force-pushed
the
vcvars_cmake_ninja
branch
from
October 19, 2018 10:42
a0e32bd to
869c879
Compare
- ensure vcvars apply for Ninja/NMake generators Signed-off-by: SSE4 <tomskside@gmail.com>
danimtb
approved these changes
Oct 22, 2018
danimtb
left a comment
Member
There was a problem hiding this comment.
I remember this change was done some time ago. Was this tested somewhere? If not, we should write a test for it
danimtb
reviewed
Oct 22, 2018
danimtb
left a comment
Member
There was a problem hiding this comment.
I remember this change (using vcvasr for ninja) was done some time ago. Was it tested somewhere? If not, it will require a proper test
memsharded
approved these changes
Oct 22, 2018
memsharded
approved these changes
Oct 22, 2018
memsharded
left a comment
Member
There was a problem hiding this comment.
This makes sense, but it would deserve (a unit test, no need full integration test) a test
Contributor
Author
|
I am adding the test |
Signed-off-by: SSE4 <tomskside@gmail.com>
Contributor
Author
|
unit test has been added |
Contributor
Author
|
I am not sure about CI, it fails with strange error: not sure how is it related to my changes, probably an infrastructure error, so please re-start build |
5 tasks
grisumbras
pushed a commit
to grisumbras/conan
that referenced
this pull request
Dec 27, 2018
Fix: use self._run instead of self._conanfile.run to ensure vcvars apply for Ninja/NMake generators
This file contains hidden or 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
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.
follow up on #2803
when using
ninja_installer/1.8.2@bincrafters/stable, right now the following code is required:I tried to simplify it in our
zmq/4.2.2@bincrafters/stablerecipe, but it currently fails, because there are places inCMakehelper which useself._conanfile.rundirectly instead ofself._run:https://github.com/conan-io/conan/blob/1.8.3/conans/client/build/cmake.py#L183
https://github.com/conan-io/conan/blob/1.8.3/conans/client/build/cmake.py#L185
Changelog: Fix:
vcvarsis also called in theCMake()build helper when usingNinjaorNMakegenerators.developbranch, documenting this one.