Skip to content

Conversation

@kousu
Copy link
Contributor

@kousu kousu commented Mar 20, 2019

Fixes #75

kousu added 3 commits March 20, 2019 00:43
This fixes the opencv wrapper code on Darwin; probably on other platforms too,
though maybe they are less strict.
This was breaking the build on Darwin. I don't know how it wasn't doing so on Linux
too; perhaps Linux triggers HAVE_ICONV_IN_LIBC so it never came up?

cmake wants all instances of this sort of variable to be named
> Xxx_LIBRARIES
>    The libraries to link against to use Xxx. These should include full paths. This should not be a cache entry.
- https://cmake.org/cmake/help/v3.0/manual/cmake-developer.7.html#find-modules
@Benjamin-Dobell
Copy link
Member

Benjamin-Dobell commented Mar 20, 2019

Looks good, but could I please get the OpenCV4 commit pulled out into a different PR, and preferably changed to something like:

#if CV_MAJOR_VERSION >= 4
#ifndef CV_CAP_PROP_FRAME_WIDTH
#define CV_CAP_PROP_FRAME_WIDTH CAP_PROP_FRAME_WIDTH
#endif
#ifndef CV_BGR2GRAY
#define CV_BGR2GRAY COLOR_BGR2GRAY
#endif
#endif

so as to keep compatibility with OpenCV 2 & 3.

@kousu
Copy link
Contributor Author

kousu commented Mar 20, 2019

Hi @Benjamin-Dobell ! I split the opencv4 patches to #77 like you asked; I left them in this (so, this PR now depends on that PR) since I need both to get the build working on Darwin. I hope that's okay.

@kousu
Copy link
Contributor Author

kousu commented Mar 20, 2019

I'd say this PR is friends with #62, which is a bunch of similar patches made for Windows. If you're feeling up to merging this, can I spend some social capital on getting that merged too?

@Benjamin-Dobell
Copy link
Member

Yikes I made a mess of the Git history. However, this should be all merged now.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants