Skip to content

Commit 41ce483

Browse files
Tentative fix issue with qt5 uic and moc
Signed-off-by: Cédrik Fuoco <[email protected]>
1 parent 541b579 commit 41ce483

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ jobs:
343343
344344
- name: Install Homebrew dependencies
345345
run: |
346-
brew install --quiet --formula cmake ninja readline sqlite3 xz zlib tcl-tk autoconf automake libtool python yasm clang-format black meson nasm pkg-config glew
346+
brew install --quiet --formula cmake ninja readline sqlite3 xz zlib tcl-tk autoconf automake libtool python yasm clang-format black meson nasm pkg-config glew icu4c
347347
348348
- name: Set QT_HOME
349349
if: matrix.arch-type == 'x86_64'

cmake/dependencies/qt5.cmake

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,11 @@ FIND_PACKAGE(
5353
REQUIRED
5454
)
5555

56-
SET(QT_MOC_EXECUTABLE "${Qt5Core_MOC_EXECUTABLE}" CACHE STRING "Qt MOC executable")
57-
SET(QT_UIC_EXECUTABLE "${Qt5Widgets_UIC_EXECUTABLE}" CACHE STRING "Qt UIC executable")
56+
get_target_property(MOC_EXECUTABLE Qt5::moc IMPORTED_LOCATION)
57+
get_target_property(UIC_EXECUTABLE Qt5::uic IMPORTED_LOCATION)
58+
59+
SET(QT_MOC_EXECUTABLE "${MOC_EXECUTABLE}" CACHE STRING "Qt MOC executable")
60+
SET(QT_UIC_EXECUTABLE "${UIC_EXECUTABLE}" CACHE STRING "Qt UIC executable")
5861

5962
SET(_qt_copy_message
6063
"Copying Qt into ${RV_STAGE_ROOT_DIR}"

0 commit comments

Comments
 (0)