Use nmake #816
Closed
Use nmake #816
Conversation
This file contains 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
| make_check_cmake_cmd = ['ninja', 'build.ninja'] | ||
| elif use_namke: |
|
Thanks for the pull request - good to see you continue to work with ROS. Once this passes CI I would merge it into kinetic-devel first. It can also be backported into Indigo / Jade if you need that since the risk of regressions seems rather low to me. |
|
@ros-pull-request-builder retest this please |
|
I squashed and cherry-picked the patch to the kinetic-devel branch: d0c4ecb |
|
Awesome, thanks |
| @@ -520,9 +530,11 @@ def build_cmake_package( | |||
|
|
|||
| # Run make | |||
| if not use_ninja: | |||
| make_executable = 'make' | |||
| else: | |||
| make_executable = 'ninja' | |||
There was a problem hiding this comment.
Is this condition inverted? It looks like it now says:
if not use_ninja:
make_executable = 'ninja'That would seem to be the inverse of what is actually the intent.
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.
@dirk-thomas hope you are doing well.
This is just an enhancement that would allow handling nmake same way as ninja.
Did only test with indigo but can compare with latest development and update my PR