Commit 3e8d75c 1 parent 268b530 commit 3e8d75c Copy full SHA for 3e8d75c
File tree 2 files changed +6
-3
lines changed
2 files changed +6
-3
lines changed Original file line number Diff line number Diff line change @@ -55,10 +55,12 @@ jobs:
55
55
echo ("QT_VERSION=6.6.*") >> $env:GITHUB_ENV
56
56
57
57
- name : Install Qt
58
+ if : matrix.os != 'macos-14'
58
59
uses : jurplel/install-qt-action@v4
59
60
with :
60
61
cache : ' true'
61
62
version : ${{ env.QT_VERSION }}
63
+
62
64
- name : Install dependencies
63
65
shell : bash
64
66
run : |
Original file line number Diff line number Diff line change @@ -14,13 +14,14 @@ set(CMAKE_AUTOMOC ON)
14
14
set (CMAKE_AUTOUIC ON )
15
15
set (CMAKE_AUTORCC ON )
16
16
17
+ set (OPENCV_RELIGHT_LIBS opencv_core opencv_imgcodecs opencv_imgproc opencv_video)
18
+
17
19
if (APPLE )
18
20
set (CMAKE_OSX_DEPLOYMENT_TARGET "11.0" CACHE STRING "Minimum OS X deployment version" FORCE)
19
21
SET (CMAKE_INSTALL_RPATH $ORIGIN/../Frameworks)
20
22
set (CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE )
21
- else ()
22
- set (OPENCV_RELIGHT_LIBS opencv_core opencv_imgcodecs opencv_imgproc opencv_video)
23
- add_compile_definitions (WITH_OPENCV)
23
+ #else()
24
+ # add_compile_definitions(WITH_OPENCV)
24
25
endif ()
25
26
26
27
You can’t perform that action at this time.
0 commit comments