-
Notifications
You must be signed in to change notification settings - Fork 6.4k
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
[opencv] Fix import paths for debug Android builds #24394
Conversation
Please click "ready for review" then I will review this PR. |
@hh10k Is it ready for review? |
Yes, this is ready for review. It includes the fix for OpenCV 3 and 4, and all the changes from |
@JackBoosY FYI |
just noticed one thing: please try to test your pr using the x64-windows-release community triplet and check if it works i suppose you have to wrap your fix within the clause |
@cenit @JackBoosY I tested with the I couldn't confirm whether a debug single configuration build would actually work though, because some dependency builds are broken. |
single config debug triplets cannot work by design in vcpkg so that's not a problem about the fix, a simpler clause like the one i told you was similarly effective, but yours is ok too |
Ah, sorry for making it more complicated than necessary. I saw 164 instances of |
until I asked and insisted with a test PR in #16110, the stance about the broken debug-only triplets was not clear. That's why in many places we were still hoping about that possibility |
LGTM. |
Maybe we should add something like |
Thanks :) |
just the first part is ok
without the which also means that somehow the only valid value for the build type is "release", but since release could be overridden to have debug, it has lost its meaning. It should just be spelled as "vcpkg_single_config_build"... |
What does your PR fix?
Fixes OpenCV 4 import paths for Android debug builds.
For Android builds OpenCV places library outputs under a
sdk/native/staticlibs/<arch>
directory, and vcpkg correctly copies these to the install directory as eithervcpkg_installed/<triplet>/sdk/...
for release orvcpkg_installed/<triplet>/debug/sdk/...
for debug, however theOpenCVModules-debug.cmake
is not automatically updated by vcpkg_cmake_config_fixup to reference the debug directory.Which triplets are supported/not supported? Have you updated the CI baseline?
OpenCV will only use this
sdk
directory when the ANDROID cmake variable is set. I'm not aware of behaviour change based on the triplet.Does your PR follow the maintainer guide?
I have read the guide and I think this PR follows it.
If you have added/updated a port: Have you run
./vcpkg x-add-version --all
and committed the result?Yes