Skip to content

83 compile with opencv contrib #85

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.

Sign up for GitHub

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

Open
wants to merge 63 commits into
base: develop
Choose a base branch
from
Open

83 compile with opencv contrib #85

Changes from 1 commit
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
a2179b8
Build with contrib
qwelyt Nov 10, 2022
3c2d025
Use non-depricated versions
qwelyt Nov 10, 2022
cf32529
Update to run on ubuntu22.04 and use bash in windows
qwelyt Nov 11, 2022
7441828
Use 20.04 and remove bad line
qwelyt Nov 11, 2022
4b82bb9
Follow redirect
qwelyt Nov 11, 2022
222f434
Install certs and make windows with cmake
qwelyt Nov 11, 2022
66e7584
Don't check certs, no windows target
qwelyt Nov 11, 2022
9257f79
Go back to 18.04 for arm builds
qwelyt Nov 16, 2022
62eb21a
Copy libs
qwelyt Nov 17, 2022
43d050e
Debug windows build
qwelyt Nov 17, 2022
2106b28
Update windows build and add test contrib
qwelyt Nov 23, 2022
6ee02f3
Change to unzip and remove bad path
qwelyt Nov 23, 2022
eaea13e
Stupid missing backslash
qwelyt Nov 23, 2022
de3b4b4
ANT_HOME is not set in runner, try to find it
qwelyt Nov 23, 2022
c99c070
Log
qwelyt Nov 23, 2022
cb393d0
MAVEN_HOME is not set. Move from JAVA_HOME
qwelyt Nov 23, 2022
62e2171
Log ant
qwelyt Nov 23, 2022
336fb42
Just show me everything
qwelyt Nov 23, 2022
c5afe76
Install ant and see if env var gets set
qwelyt Nov 23, 2022
387565e
dfj
qwelyt Nov 23, 2022
2a2f97b
Ant should be there hope opencv finds it
qwelyt Nov 23, 2022
669864d
Set ant path for cmake
qwelyt Nov 23, 2022
200cf24
Add slash remove or
qwelyt Nov 23, 2022
49e6789
Remove windows test
qwelyt Nov 24, 2022
6e2e880
Aha, wrong hard-coded search path.
qwelyt Nov 24, 2022
1d04feb
Fix windows dll name
qwelyt Nov 24, 2022
1174075
Format
qwelyt Nov 24, 2022
999e173
Rename dll
qwelyt Nov 24, 2022
d6243e2
Stupid hardcoded paths
qwelyt Nov 24, 2022
ca6c53d
Do mvn test with powershell
qwelyt Nov 24, 2022
2fede8c
No tests on windows
qwelyt Nov 24, 2022
a3a0fea
We only have two cores on windows, see if this is faster
qwelyt Nov 24, 2022
29e61c2
Change artifacts paths
qwelyt Nov 25, 2022
9b84edd
Where are the files
qwelyt Nov 25, 2022
03b9797
Perhaps correct path now
qwelyt Nov 25, 2022
6dc0cc7
Enable linux and mac
qwelyt Nov 25, 2022
a5f95ba
Add needs
qwelyt Nov 25, 2022
8b8b242
Enable arm
qwelyt Nov 27, 2022
9fe1357
Fix needs
qwelyt Nov 27, 2022
de97c8d
Fix arm paths
qwelyt Nov 28, 2022
20875f4
Try and use ninja instead of mingw
qwelyt Nov 28, 2022
8ca2da0
Install ninja and fix vcvars path
qwelyt Nov 28, 2022
338a86e
Disable windows tests
qwelyt Nov 28, 2022
0452625
Try with windows-2019
qwelyt Nov 29, 2022
44a596f
Fix VS path
qwelyt Nov 29, 2022
22a62a8
Use VS to compile
qwelyt Nov 29, 2022
d933306
Back to mingw
qwelyt Nov 29, 2022
510c2b2
Rename to opencv_java455.dll
qwelyt Nov 29, 2022
817c17a
Fix paths and up version
qwelyt Nov 29, 2022
e783dea
- Test release v4.6.0
vonnieda Dec 14, 2022
00ed90a
Update README.md
vonnieda Mar 20, 2023
91fc673
Bump opencv to 4.7.0
thomedw Mar 20, 2023
62274af
Try windows again
qwelyt Apr 25, 2023
14d4536
Let's find the files
qwelyt Apr 25, 2023
2892768
Probably correct path now
qwelyt Apr 25, 2023
2f8dcb6
Play with paths
qwelyt Apr 25, 2023
415ba4f
Remove `lib`
qwelyt Apr 25, 2023
0dddcbf
Fix copy
qwelyt Apr 25, 2023
fa250af
Fix path
qwelyt Apr 25, 2023
fa3fb64
Enable mac and linux
qwelyt Apr 25, 2023
c93851d
Oops. x64, no 86.
qwelyt Apr 25, 2023
0d81ce6
Enable all platforms
qwelyt Apr 26, 2023
c104c0a
Add back the cxx standard
qwelyt Apr 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Rename dll
  • Loading branch information
@qwelyt
qwelyt committed Nov 24, 2022
commit 999e173d2c6b5a282ae1726b4c8e37e54d99d9aa
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,7 +472,7 @@ jobs:
shell: bash
run: |
cp opencv-${{ env.OPENCV_VERSION }}/build/bin/opencv-${{ env.OPENCV_VERSION_SHORT }}.jar upstream/
cp opencv-${{ env.OPENCV_VERSION }}/build/bin/libopencv_java${{ env.OPENCV_VERSION_SHORT }}.dll src/main/resources/nu/pattern/opencv/windows/x86_64/
cp opencv-${{ env.OPENCV_VERSION }}/build/bin/libopencv_java${{ env.OPENCV_VERSION_SHORT }}.dll src/main/resources/nu/pattern/opencv/windows/x86_64/opencv_java${{ env.OPENCV_VERSION_SHORT }}.dll

- name: Build with Maven
shell: bash
Expand Down Expand Up @@ -527,7 +527,7 @@ jobs:
# cp ubuntu-20.04-arm/lib/libopencv_java${{ env.OPENCV_VERSION_SHORT }}.so src/main/resources/nu/pattern/opencv/linux/ARMv7
# cp ubuntu-20.04-arm64/lib/libopencv_java${{ env.OPENCV_VERSION_SHORT }}.so src/main/resources/nu/pattern/opencv/linux/ARMv8
# cp windows-2022/x86/libopencv_java${{ env.OPENCV_VERSION_SHORT }}.dll src/main/resources/nu/pattern/opencv/windows/x86_32
cp windows-2022/x64/libopencv_java${{ env.OPENCV_VERSION_SHORT }}.dll src/main/resources/nu/pattern/opencv/windows/x86_64
cp windows-2022/x64/opencv_java${{ env.OPENCV_VERSION_SHORT }}.dll src/main/resources/nu/pattern/opencv/windows/x86_64

- name: Build with Maven
run: mvn -B install
Expand Down