Skip to content

osxInstaller: add the build Qt's lib dir to fixup_bundle search dirs #556

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rogerawong wants to merge 1 commit into
base: master
Choose a base branch
from
Open

osxInstaller: add the build Qt's lib dir to fixup_bundle search dirs #556

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions avidemux/osxInstaller/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,16 @@ LIST(APPEND bundleDirs "${BUNDLE}/Contents/Resources/lib")
IF(ENABLE_QT6)
# A gross hack to work around the failure to resolve @loader_path for libbrotli.
LIST(APPEND bundleDirs "/usr/local/lib")
# Let fixup_bundle resolve the @rpath/Qt*.framework references carried by the
# Qt platform and style plugins against the Qt actually used for this build
# (Homebrew on arm64 or Intel, or a custom MYQT installation alike). Whether
# the app binaries otherwise carry a usable rpath for this depends on the
# install-rpath machinery, which e.g. a LIBRARY_PATH environment variable
# silently disables.
IF(Qt6_DIR)
get_filename_component(ADM_QT_LIB_DIR "${Qt6_DIR}/../.." ABSOLUTE)
LIST(APPEND bundleDirs "${ADM_QT_LIB_DIR}")
ENDIF()
ENDIF()
#

Expand Down