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

Fix custom CMake tasks for tools besides 'make' #8

Merged
merged 1 commit into from
Dec 13, 2016
Merged

Conversation

matteblair
Copy link
Member

The conditional that was here incorrectly accepts tools that have 'make' anywhere in their path (with Android Studio, the ninja binary is in a folder called 'cmake'). This change makes these targets correct for build tools other than 'make'.

The conditional that was here incorrectly accepts tools that have 'make' anywhere in their path (with Android Studio, the ninja binary is in a folder called 'cmake'). This change makes these targets correct for build tools other than 'make'.
Copy link
Member

@hjanetzek hjanetzek left a comment

Choose a reason for hiding this comment

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

LGTM

@hjanetzek hjanetzek merged commit 258e8a1 into tangram Dec 13, 2016
@hjanetzek hjanetzek deleted the fix-ninja branch December 13, 2016 14:44
hjanetzek pushed a commit that referenced this pull request Sep 18, 2018
The conditional that was here incorrectly accepts tools that have 'make' anywhere in their path (with Android Studio, the ninja binary is in a folder called 'cmake'). This change makes these targets correct for build tools other than 'make'.
hjanetzek pushed a commit that referenced this pull request Nov 18, 2018
The conditional that was here incorrectly accepts tools that have 'make' anywhere in their path (with Android Studio, the ninja binary is in a folder called 'cmake'). This change makes these targets correct for build tools other than 'make'.
hjanetzek pushed a commit that referenced this pull request Nov 19, 2018
The conditional that was here incorrectly accepts tools that have 'make' anywhere in their path (with Android Studio, the ninja binary is in a folder called 'cmake'). This change makes these targets correct for build tools other than 'make'.
hjanetzek pushed a commit that referenced this pull request Nov 29, 2018
The conditional that was here incorrectly accepts tools that have 'make' anywhere in their path (with Android Studio, the ninja binary is in a folder called 'cmake'). This change makes these targets correct for build tools other than 'make'.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants