Skip to content

Fix dnn plugin build win32#25395

Merged
asmorkalov merged 1 commit intoopencv:4.xfrom
susumu-iino:fix-dnn-plugin-build-win32
Apr 12, 2024
Merged

Fix dnn plugin build win32#25395
asmorkalov merged 1 commit intoopencv:4.xfrom
susumu-iino:fix-dnn-plugin-build-win32

Conversation

@susumu-iino
Copy link
Copy Markdown
Contributor

(This PR is recreated from #25340)

Fixes #24392.
I'm not sure this is the best practice, but looks working well for me with rev.2c5b296
Any helps or advice are welcomed if this patch need to be modified.

Pull Request Readiness Checklist

See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request

  • I agree to contribute to the project under Apache 2 License.
  • To the best of my knowledge, the proposed patch is not based on a code under GPL or another license that is incompatible with OpenCV
  • The PR is proposed to the proper branch
  • There is a reference to the original bug report and related work
  • There is accuracy test, performance test and test data in opencv_extra repository, if applicable
    Patch to opencv_extra has the same branch name.
  • The feature is well documented and sample code can be built with the project CMake

@opencv-alalek
Copy link
Copy Markdown
Contributor

Thank you for contribution!


Merge branch 'opencv:4.x' into fix-dnn-plugin-build-win32

Could you please do "git rebase" to avoid unnecessary "merge" commit in PR?

@susumu-iino
Copy link
Copy Markdown
Contributor Author

@opencv-alalek thank for taking a look!

Could you please do "git rebase" to avoid unnecessary "merge" commit in PR?

I tried it, is this correct?

@mshabunin
Copy link
Copy Markdown
Contributor

mshabunin commented Apr 11, 2024

Try the following commands:

# make sure this branch is active
git checkout fix-dnn-plugin-build-win32
# reset branch to the first commit
git reset --hard a0b28f8b0640614f2aae771ded8b0a11975a4439
# assuming "upstream" is github.com/opencv/opencv
git rebase upstream/4.x
# push, assuming "origin" is your fork
git push -f origin fix-dnn-plugin-build-win32

@susumu-iino susumu-iino force-pushed the fix-dnn-plugin-build-win32 branch from 7738fe6 to a0b28f8 Compare April 11, 2024 21:25
@susumu-iino
Copy link
Copy Markdown
Contributor Author

@mshabunin thanks for teaching detail of the process.
I tried your guidance, and the result seems to be that @opencv-alalek ordered.

@asmorkalov asmorkalov merged commit ecbfc1b into opencv:4.x Apr 12, 2024
@susumu-iino susumu-iino deleted the fix-dnn-plugin-build-win32 branch April 14, 2024 21:46
@asmorkalov asmorkalov mentioned this pull request Apr 16, 2024
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.

Building DNN_PLUGIN:openvino is broken in Visual Studio 2019 when -DBUILD_opencv_world=ON

4 participants