Skip to content

Fix library include path for remover/updater #790

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
kinnajowa wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix library include path for remover/updater #790

Show file tree
Hide file tree
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
12 changes: 12 additions & 0 deletions cmake/install.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,16 @@ set(_abs_private_libdir ${CMAKE_INSTALL_PREFIX}/${_private_libdir})
file(RELATIVE_PATH _rpath ${_abs_bindir} ${_abs_private_libdir})
set(_rpath "\$ORIGIN/${_rpath}")

# in addition to $ORIGIN, binaries/libraries living in the private libdir need to be able to find the libraries
# linuxdeploy bundles when deploying the AppDir (e.g., libgpgme, libgpg-error, libassuan pulled in transitively by
# libappimageupdate). Linuxdeploy always places those in the *flat* usr/lib. Without this, those libraries silently fail
# to load at runtime (see the remove/update targets for the executable side)
set(_abs_flat_libdir ${CMAKE_INSTALL_PREFIX}/lib)
file(RELATIVE_PATH _rpath_flat_libdir ${_abs_private_libdir} ${_abs_flat_libdir})
set(_rpath_flat_libdir "\$ORIGIN/${_rpath_flat_libdir}")

set_target_properties(libappimage PROPERTIES INSTALL_RPATH "\$ORIGIN;${_rpath_flat_libdir}")

# install libappimage.so into lib/appimagekit to avoid overwriting a libappimage potentially installed into /usr/lib
# or /usr/lib/x86_64-... or wherever the OS puts its libraries
install(
Expand All @@ -37,6 +47,8 @@ install(
)

if(ENABLE_UPDATE_HELPER)
set_target_properties(libappimageupdate libappimageupdate-qt PROPERTIES INSTALL_RPATH "\$ORIGIN;${_rpath_flat_libdir}")

install(
TARGETS libappimageupdate libappimageupdate-qt
LIBRARY DESTINATION "${_private_libdir}" COMPONENT APPIMAGELAUNCHER
Expand Down
10 changes: 7 additions & 3 deletions src/ui/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,11 @@ install(
add_executable(remove remove_main.cpp remove.ui resources.qrc)
target_link_libraries(remove shared translationmanager libappimage)
# see AppImageLauncher for a description
set_target_properties(remove PROPERTIES INSTALL_RPATH "\$ORIGIN")
# in addition to $ORIGIN (where libappimage.so etc. are installed to), we also need the flat lib dir (see
# _rpath_flat_libdir in install.cmake), as that's where linuxdeploy bundles transitive dependencies (e.g.,
# libgpgme, libgpg-error, libassuan pulled in by libappimageupdate) when deploying the AppDir; without it, those
# libraries silently fail to load at runtime
set_target_properties(remove PROPERTIES INSTALL_RPATH "\$ORIGIN;${_rpath_flat_libdir}")

install(
TARGETS
Expand All @@ -49,8 +53,8 @@ install(
if(ENABLE_UPDATE_HELPER)
add_executable(update update.ui update_main.cpp resources.qrc)
target_link_libraries(update shared translationmanager libappimage libappimageupdate-qt Qt5::Quick Qt5::QuickWidgets Qt5::Qml)
# see AppImageLauncher for a description
set_target_properties(update PROPERTIES INSTALL_RPATH "\$ORIGIN")
# see remove target above for a description of why the flat lib dir is included, too
set_target_properties(update PROPERTIES INSTALL_RPATH "\$ORIGIN;${_rpath_flat_libdir}")

install(
TARGETS
Expand Down
Loading