Skip to content

Commit 2c73431

Browse files
committed
[feat] global: update to openCV 4.8.0
1 parent 9023da2 commit 2c73431

File tree

5 files changed

+12
-11
lines changed

5 files changed

+12
-11
lines changed

.github/workflows/build.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ on:
66

77
env:
88
QT_VERSION: 6.5.1
9-
OPENCV_VERSION: 4.7.0
9+
OPENCV_VERSION: 4.8.0
10+
OPENCV_VERSION_: 480
1011

1112
jobs:
1213
build_linux:
@@ -87,8 +88,8 @@ jobs:
8788
windeployqt FastTrack/FastTrack.exe --no-translations # https://bugreports.qt.io/browse/QTBUG-62103?jql=status%20%3D%20Open%20AND%20text%20~%20%22windeployqt%20platform%22 and https://bugreports.qt.io/browse/QTBUG-112204
8889
cp ..\assets\icon.ico FastTrack
8990
cp ${{ github.workspace }}/Qt/Tools/mingw*/bin/libgomp-1.dll FastTrack
90-
cp ${{ github.workspace }}/OpenCV_MinGW_64/bin/opencv_videoio_ffmpeg470_64.dll FastTrack
91-
cp ${{ github.workspace }}/OpenCV_MinGW_64/bin/libopencv_world470.dll FastTrack
91+
cp ${{ github.workspace }}/OpenCV_MinGW_64/bin/opencv_videoio_ffmpeg${{ env.OPENCV_VERSION_ }}_64.dll FastTrack
92+
cp ${{ github.workspace }}/OpenCV_MinGW_64/bin/libopencv_world${{ env.OPENCV_VERSION_ }}.dll FastTrack
9293
cp *.qm FastTrack
9394
- name: upload_artefact
9495
uses: actions/upload-artifact@v1

.github/workflows/build_cli.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ on:
66

77
env:
88
QT_VERSION: 6.5.1
9-
OPENCV_VERSION: 4.7.0
9+
OPENCV_VERSION: 4.8.0
10+
OPENCV_VERSION_: 480
1011

1112
jobs:
1213
build_linux:
@@ -81,8 +82,8 @@ jobs:
8182
windeployqt FastTrack-Cli.exe --no-translations # https://bugreports.qt.io/browse/QTBUG-62103?jql=status%20%3D%20Open%20AND%20text%20~%20%22windeployqt%20platform%22 and https://bugreports.qt.io/browse/QTBUG-112204
8283
cp ..\assets\icon.ico .
8384
cp ${{ github.workspace }}/Qt/Tools/mingw*/bin/libgomp-1.dll .
84-
cp ${{ github.workspace }}/OpenCV_MinGW_64/bin/opencv_videoio_ffmpeg470_64.dll .
85-
cp ${{ github.workspace }}/OpenCV_MinGW_64/bin/libopencv_world470.dll .
85+
cp ${{ github.workspace }}/OpenCV_MinGW_64/bin/opencv_videoio_ffmpeg${{ env.OPENCV_VERSION_ }}_64.dll .
86+
cp ${{ github.workspace }}/OpenCV_MinGW_64/bin/libopencv_world${{ env.OPENCV_VERSION_ }}.dll .
8687
- name: upload_artefact
8788
uses: actions/upload-artifact@v2
8889
with:

src/FastTrack-Cli.pro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ win32 {
5757
CONFIG += c++2a
5858
QMAKE_CXXFLAGS += -O3
5959
CONFIG += console
60-
LIBS += -L"$$PWD/../OpenCV_MinGW_64/lib" -lopencv_world470
60+
LIBS += -L"$$PWD/../OpenCV_MinGW_64/lib" -lopencv_world480
6161
INCLUDEPATH += "$$PWD/../OpenCV_MinGW_64/include"
6262
}
6363

src/FastTrack.pro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ win32 {
5353
TARGET = FastTrack
5454
CONFIG += c++2a
5555
QMAKE_CXXFLAGS += -O3
56-
LIBS += -L"$$PWD/../OpenCV_MinGW_64/lib" -lopencv_world470
56+
LIBS += -L"$$PWD/../OpenCV_MinGW_64/lib" -lopencv_world480
5757
INCLUDEPATH += "$$PWD/../OpenCV_MinGW_64/include"
5858
}
5959

test/Test.pro

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@ unix:!macx {
2424

2525
unix:macx {
2626
CONFIG += c++17
27-
QMAKE_CXXFLAGS += -std=c++1z -stdlib=libc++ -mmacosx-version-min=10.15 -O3 -g -Xpreprocessor
28-
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.15
27+
QMAKE_CXXFLAGS += -std=c++1z -stdlib=libc++ -O3 -g -Xpreprocessor
2928
QMAKE_LFLAGS_SONAME = -Wl,-install_name,@executable_path/../Frameworks/
3029
QT_CONFIG -= no-pkg-config
3130
CONFIG += link_pkgconfig
@@ -36,7 +35,7 @@ unix:macx {
3635
win32 {
3736
CONFIG += c++2a
3837
QMAKE_CXXFLAGS += -O3 -g
39-
LIBS += -L"$$PWD/../OpenCV_MinGW_64/bin" -lopencv_world470
38+
LIBS += -L"$$PWD/../OpenCV_MinGW_64/bin" -lopencv_world480
4039
INCLUDEPATH += "$$PWD/../OpenCV_MinGW_64/include"
4140
LIBS += -L"$$PWD/../googletest/build/install/lib" -lgtest -lgtest_main
4241
INCLUDEPATH += "$$PWD/../googletest/build/install/include/"

0 commit comments

Comments
 (0)