Skip to content

Commit 3e8d75c

Browse files
committed
opencv installs qt, it seems.
1 parent 268b530 commit 3e8d75c

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

.github/workflows/BuildRelight.yml

+2
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,12 @@ jobs:
5555
echo ("QT_VERSION=6.6.*") >> $env:GITHUB_ENV
5656
5757
- name: Install Qt
58+
if: matrix.os != 'macos-14'
5859
uses: jurplel/install-qt-action@v4
5960
with:
6061
cache: 'true'
6162
version: ${{ env.QT_VERSION }}
63+
6264
- name: Install dependencies
6365
shell: bash
6466
run: |

relightlab/CMakeLists.txt

+4-3
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,14 @@ set(CMAKE_AUTOMOC ON)
1414
set(CMAKE_AUTOUIC ON)
1515
set(CMAKE_AUTORCC ON)
1616

17+
set(OPENCV_RELIGHT_LIBS opencv_core opencv_imgcodecs opencv_imgproc opencv_video)
18+
1719
if (APPLE)
1820
set(CMAKE_OSX_DEPLOYMENT_TARGET "11.0" CACHE STRING "Minimum OS X deployment version" FORCE)
1921
SET(CMAKE_INSTALL_RPATH $ORIGIN/../Frameworks)
2022
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)
2425
endif()
2526

2627

0 commit comments

Comments
 (0)