Skip to content
This repository was archived by the owner on Mar 28, 2026. It is now read-only.

Commit 9a94e85

Browse files
committed
Fix macOS CI build path and rpath resolution
- Fix install prefix path mismatch (output/ not build/output/) - Add -libpath args to macdeployqt for Qt and homebrew libs - Include homebrew lib path in DYLD_* environment variables
1 parent 2d7d449 commit 9a94e85

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

.github/workflows/build-macos.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ jobs:
3131
cmake --build build --target install
3232
- name: Sign and create dmg
3333
run: |
34-
codesign --force --deep -s - "./build/output/Jellyfin Desktop.app/"
34+
codesign --force --deep -s - "./output/Jellyfin Desktop.app/"
3535
brew install create-dmg
36-
create-dmg --volname "Jellyfin Desktop" --no-internet-enable "Jellyfin Desktop.dmg" "./build/output/Jellyfin Desktop.app"
36+
create-dmg --volname "Jellyfin Desktop" --no-internet-enable "Jellyfin Desktop.dmg" "./output/Jellyfin Desktop.app"
3737
- name: Archive production artifacts
3838
uses: actions/upload-artifact@v4
3939
with:

CMakeModules/CompleteBundleOSX.cmake.in

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,14 @@ endif()
1313
set(args ${app})
1414
list(APPEND args "-verbose=2")
1515
list(APPEND args "-qmldir=@SOURCE_ROOT@/src/ui")
16+
list(APPEND args "-libpath=@QTROOT@/lib")
17+
list(APPEND args "-libpath=${rpath_str}")
1618
foreach(BIN ${BINS})
1719
list(APPEND args "-executable=${app}/${BIN}")
1820
endforeach(BIN ${BINS})
1921

20-
set(ENV{DYLD_LIBRARY_PATH} @QTROOT@/lib:@DEPENDENCY_ROOT@/lib)
21-
set(ENV{DYLD_FRAMEWORK_PATH} @QTROOT@/lib:@DEPENDENCY_ROOT@/lib)
22+
set(ENV{DYLD_LIBRARY_PATH} @QTROOT@/lib:${rpath_str}:@DEPENDENCY_ROOT@/lib)
23+
set(ENV{DYLD_FRAMEWORK_PATH} @QTROOT@/lib:${rpath_str}:@DEPENDENCY_ROOT@/lib)
2224

2325
execute_process(
2426
COMMAND ${CMAKE_COMMAND} -E remove "${app}/Contents/Resources/qt.conf"

0 commit comments

Comments
 (0)