Skip to content

forget to look in subfolder of include/openblas#17679

Closed
hkinke wants to merge 0 commit intoopencv:masterfrom
hkinke:master
Closed

forget to look in subfolder of include/openblas#17679
hkinke wants to merge 0 commit intoopencv:masterfrom
hkinke:master

Conversation

@hkinke
Copy link
Copy Markdown

@hkinke hkinke commented Jun 27, 2020

When provide environment variable OpenBLAS_HOME, OpenCVFindOpenBLAS.cmake forgets to look in ${OpenBLAS_HOME}/include/openblas for include files.

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!

As a "bugfix" 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".

@hkinke hkinke changed the base branch from master to 3.4 July 1, 2020 23:26
@hkinke hkinke changed the base branch from 3.4 to master July 2, 2020 00:10
@hkinke hkinke closed this Jul 2, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug category: build/install pr: needs rebase Rebase patch (and squash fixup commits) on the top of target branch

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants