Skip to content

Check for CMake 3.19 if Xcode version is 12.2 or higher#19024

Merged
opencv-pushbot merged 1 commit intoopencv:masterfrom
komakai:cmake319-proposal2
Dec 11, 2020
Merged

Check for CMake 3.19 if Xcode version is 12.2 or higher#19024
opencv-pushbot merged 1 commit intoopencv:masterfrom
komakai:cmake319-proposal2

Conversation

@komakai
Copy link
Copy Markdown
Contributor

@komakai komakai commented Dec 6, 2020 •
edited
Loading

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

This PR addresses #19014

  • remove obsolete check for Cmake version 3.0 or greater when using Xcode 4.3 or greater
  • add .py script check for Cmake version 3.19 or greater when build for iOS with Xcode 12.2 or greater
  • add .py script check for Cmake version 3.17 or greater when build for macOS or build for iOS with Xcode 12.1 or lower

@alalek
Copy link
Copy Markdown
Member

alalek commented Dec 6, 2020

  • does latest CMake necessary for regular OSX builds (not iOS, frameworks)?
  • behavior for Xcode <= 12.1 is changed too
  • perhaps we may want to adapt .py scripts too, like these checks

@asmorkalov asmorkalov requested a review from alalek December 7, 2020 08:56
@asmorkalov
Copy link
Copy Markdown
Contributor

asmorkalov commented Dec 9, 2020

@komakai Friendly reminder.

@komakai
Copy link
Copy Markdown
Contributor Author

komakai commented Dec 9, 2020

Converting to draft while I think about how to handle this

@komakai komakai marked this pull request as draft December 9, 2020 23:33
@komakai komakai closed this Dec 10, 2020
@komakai komakai reopened this Dec 10, 2020
@komakai komakai marked this pull request as ready for review December 10, 2020 12:47
@komakai
Copy link
Copy Markdown
Contributor Author

komakai commented Dec 10, 2020

@alalek OK I think this should cover all cases properly now

alalek
alalek approved these changes Dec 11, 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.

Looks good to me! Thank you 👍

@opencv-pushbot opencv-pushbot merged commit 9f01b97 into opencv:master Dec 11, 2020
@alalek alalek mentioned this pull request Apr 9, 2021
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

4.5.1

Development

Successfully merging this pull request may close these issues.

4 participants

@komakai @alalek @asmorkalov @opencv-pushbot