Skip to content

Enable cmake CMP0077 policy#16300

Merged
opencv-pushbot merged 1 commit intoopencv:3.4from
augustofg:cmake-cmp0077
Jan 8, 2020
Merged

Enable cmake CMP0077 policy#16300
opencv-pushbot merged 1 commit intoopencv:3.4from
augustofg:cmake-cmp0077

Conversation

@augustofg
Copy link
Copy Markdown
Contributor

When building OpenCV as a sub-project using cmake's add_subdirectory()
the OpenCV's build options would be overwritten to its default
state. With cmake 3.13+ the CMP0077 policy, option() honors previous
definitions via set().

@alalek
Copy link
Copy Markdown
Member

alalek commented Jan 7, 2020

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".

When building OpenCV as a sub-project using cmake's add_subdirectory()
the OpenCV's build options would be overwritten to its default
state. With cmake 3.13+ the CMP0077 policy, option() honors previous
definitions via set().
@augustofg
Copy link
Copy Markdown
Contributor Author

Done!

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 2d77843 into opencv:3.4 Jan 8, 2020
@alalek alalek mentioned this pull request Jan 12, 2020
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.

3 participants