Skip to content

Compilation fixes for Mac Catalyst#17304

Merged
opencv-pushbot merged 2 commits intoopencv:3.4from
chrisballinger:maccatalyst
May 17, 2020
Merged

Compilation fixes for Mac Catalyst#17304
opencv-pushbot merged 2 commits intoopencv:3.4from
chrisballinger:maccatalyst

Conversation

@chrisballinger
Copy link
Copy Markdown
Contributor

@chrisballinger chrisballinger commented May 15, 2020 •
edited by alalek
Loading

This PR resolves a few compilation issues when targeting Mac Catalyst by using the TARGET_OS_MACCATALYST conditional around iOS APIs that are unavailable on the Mac platform.

Additionally, the removal of linkage to the AssetsLibrary framework was because that library is unavailable on Mac Catalyst. It appears that the iOS specific code in OpenCV doesn't include or link against that framework, and seems to work fine without it. Perhaps it was left over from older / removed code?

Although this PR doesn't fully resolve the related issue #17291, it's a step in the right direction.

Pull Request Readiness Checklist

  • I agree to contribute to the project under OpenCV (BSD) License.
  • To the best of my knowledge, the proposed patch is not based on a code under GPL or other license that is incompatible with OpenCV
  • The PR is proposed to proper branch
  • There is reference to original bug report and related work
  • There is accuracy test, performance test and test data in opencv_extra repository, if applicable
    Patch to opencv_extra has the same branch name.
  • The feature is well documented and sample code can be built with the project CMake
force_builders=Custom Mac
build_image:Custom Mac=osx_framework
allow_multiple_commits=1

@alalek
Copy link
Copy Markdown
Member

alalek commented May 16, 2020

Thank you for the 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".

@chrisballinger chrisballinger changed the base branch from master to 3.4 May 16, 2020 19:45
@chrisballinger
Copy link
Copy Markdown
Contributor Author

chrisballinger commented May 16, 2020

@alalek Done, thanks!

alalek
alalek approved these changes May 17, 2020
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.

Well done! Thank you 👍

@opencv-pushbot opencv-pushbot merged commit 2b2bcc9 into opencv:3.4 May 17, 2020
This was referenced May 18, 2020
Merged
Merged
@chrisballinger chrisballinger mentioned this pull request Jul 22, 2020
Closed
4 tasks
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.11

Development

Successfully merging this pull request may close these issues.

3 participants

@chrisballinger @alalek @opencv-pushbot