Skip to content

Fix path resolution bugs for XCFramework builds#19076

Merged
alalek merged 2 commits intoopencv:masterfrom
Rightpoint:bugfix/colejd/fix-path-resolution-bugs
Dec 11, 2020
Merged

Fix path resolution bugs for XCFramework builds#19076
alalek merged 2 commits intoopencv:masterfrom
Rightpoint:bugfix/colejd/fix-path-resolution-bugs

Conversation

@colejd
Copy link
Copy Markdown
Contributor

@colejd colejd commented Dec 10, 2020

This PR fixes a bug found by @vade here, wherein the xcodebuild command to build the xcframework was being given the wrong paths to the constituent frameworks. It was introduced in 69e1167.

I also found another issue that prevents the use of absolute paths when assembling the xcframework, so I've also included a fix for that.

Pull Request Readiness Checklist

See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request

  • 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.
  • The feature is well documented and sample code can be built with the project CMake
force_builders_only=docs,ios,Custom Mac
build_image:Custom Mac=osx_framework-test
buildworker:Custom Mac=macosx-2

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!

@alalek alalek merged commit 9f52244 into opencv:master Dec 11, 2020
@colejd colejd deleted the bugfix/colejd/fix-path-resolution-bugs branch December 11, 2020 16:54
@colejd colejd mentioned this pull request Dec 11, 2020
4 tasks
@alalek alalek mentioned this pull request Apr 9, 2021
a-sajjad72 pushed a commit to a-sajjad72/opencv that referenced this pull request Mar 30, 2023
…h-resolution-bugs

Fix path resolution bugs for XCFramework builds

* Fix incorrect paths for intermediate frameworks

* Remove unnecessary `./` prepend preventing use of absolute paths
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants