Skip to content

- fix find_package for glog & gflags #2204

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 5, 2019

Conversation

SSE4
Copy link
Contributor

@SSE4 SSE4 commented Jul 26, 2019

This pullrequest changes

fix find_package for glog and gflags libraries, which might have different names, e.g. in debug builds they are glogd and gflags_debug(or gflags_nothreads_debug).

@alalek
Copy link
Member

alalek commented Aug 3, 2019

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

@SSE4 SSE4 changed the base branch from master to 3.4 August 3, 2019 20:04
@SSE4 SSE4 force-pushed the fix_find_glog_gflags branch from 7796de3 to 7f55468 Compare August 3, 2019 20:06
@opencv-pushbot opencv-pushbot merged commit 7f55468 into opencv:3.4 Aug 5, 2019
@alalek alalek mentioned this pull request Aug 5, 2019
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.

4 participants