Darwin build #76
Closed
Darwin build #76
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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
|
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
#endifso as to keep compatibility with OpenCV 2 & 3. |
|
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. |
|
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? |
|
Yikes I made a mess of the Git history. However, this should be all merged now. |
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #75