Skip to content

Fix MacOS build#15900

Merged
opencv-pushbot merged 1 commit intoopencv:3.4from
komakai:fix-osx-build
Nov 13, 2019
Merged

Fix MacOS build#15900
opencv-pushbot merged 1 commit intoopencv:3.4from
komakai:fix-osx-build

Conversation

@komakai
Copy link
Copy Markdown
Contributor

@komakai komakai commented Nov 12, 2019 •
edited by alalek
Loading

resolves #15899

This pullrequest changes

Adds disable parameter to the MacOS build to bring it into line with the iOS build and fix build failure

force_builders=Custom Mac
build_image:Custom Mac=osx_framework

@alalek
Copy link
Copy Markdown
Member

alalek commented Nov 12, 2019

Thank you for contribution!

This patch should go into 3.4 branch first. We will merge changes from 3.4 into master regularly (weekly/bi-weekly).

So, please:

  • change "base" branch of this PR: master => 3.4 (use "Edit" button near PR title)
  • rebase your commits from master onto 3.4 branch. For example:
    git rebase -i --onto upstream/3.4 upstream/master
    (check list of your commits, save and quit (Esc + "wq" + Enter)
    where upstream is configured by following this GitHub guide and fetched (git fetch upstream).
  • push rebased commits into source branch of your fork (with --force option)

Note: no needs to re-open PR, apply changes "inplace".

@komakai komakai changed the base branch from master to 3.4 November 13, 2019 12:09
alalek
alalek approved these changes Nov 13, 2019
View reviewed changes
Copy link
Copy Markdown
Member

@alalek alalek left a comment

Choose a reason for hiding this comment

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

Thank you 👍

opencv-pushbot pushed a commit that referenced this pull request Nov 13, 2019
@alalek
Merge pull request #15900 from komakai:fix-osx-build
ad8d7e8
@opencv-pushbot opencv-pushbot merged commit 3cdbcc1 into opencv:3.4 Nov 13, 2019
@alalek alalek mentioned this pull request Nov 17, 2019
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@alalek alalek alalek approved these changes

Assignees

@alalek alalek

Labels

category: build/install platform: ios/osx

Projects

None yet

Milestone

3.4.9

Development

Successfully merging this pull request may close these issues.

3 participants

@komakai @alalek @opencv-pushbot