Skip to content

iOS build fixes#18436

Merged
opencv-pushbot merged 3 commits intoopencv:masterfrom
komakai:fix-install-name
Sep 28, 2020
Merged

iOS build fixes#18436
opencv-pushbot merged 3 commits intoopencv:masterfrom
komakai:fix-install-name

Conversation

@komakai
Copy link
Copy Markdown
Contributor

@komakai komakai commented Sep 27, 2020 •
edited by alalek
Loading

This PR fixes #18381 and #18405

  • fix cmake file to handle case when we are not building opencv_world
  • modify install_name to not hard code library path
  • update tests and samples to work with the change to install_name

Pull Request Readiness Checklist

  • I agree to contribute to the project under Apache 2 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.
allow_multiple_commits=1

alalek
alalek reviewed Sep 27, 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.

Thank you for contribution!

modules/objc/generator/CMakeLists.txt Outdated
add_dependencies(opencv_world gen_opencv_objc_source)
else()
foreach(m ${OPENCV_OBJC_MODULES})
add_dependencies(${m} gen_opencv_objc_source)
Copy link
Copy Markdown
Member

@alalek alalek Sep 27, 2020

Choose a reason for hiding this comment

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

Are other modules depend on generated code?

Did you try?

add_dependencies(${the_module} gen_opencv_objc_source)

Copy link
Copy Markdown
Contributor Author

@komakai komakai Sep 27, 2020

Choose a reason for hiding this comment

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

OK - I've figured it out now. All I needed to do was add the target gen_opencv_objc_source to the ALL target

alalek
alalek approved these changes Sep 28, 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.

Thank you 👍

@opencv-pushbot opencv-pushbot merged commit 19f4cc5 into opencv:master Sep 28, 2020
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

4.5.0

Development

Successfully merging this pull request may close these issues.

ios dynamic framework refer to local path Can't build ios without some modules

3 participants

@komakai @alalek @opencv-pushbot