Skip to content

Commit 566ce81

Browse files
committed
Let linuxdeploy find libraries installed from muse_deps
1 parent ea8e945 commit 566ce81

3 files changed

Lines changed: 6 additions & 1 deletion

File tree

buildscripts/ci/linux/tools/make_appimage.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ export EXTRA_PLATFORM_PLUGINS="libqoffscreen.so;libqwayland.so"
109109
# Qml files can be in different directories, the qmlimportscanner will go through everything recursively.
110110
export QML_SOURCES_PATHS=./
111111

112+
export LD_LIBRARY_PATH="${appdir}/lib:${appdir}/usr/lib:${LD_LIBRARY_PATH:-}"
112113
linuxdeploy --appdir "${appdir}" # adds all shared library dependencies
113114
linuxdeploy-plugin-qt --appdir "${appdir}" # adds all Qt dependencies
114115

muse

tools/check_build_without_qt/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,10 @@ include_directories(
3939
set(MUSE_QT_SUPPORT OFF)
4040
include(${MUSE_FRAMEWORK_SRC_PATH}/cmake/MuseSetupConfiguration.cmake)
4141

42+
set(EXTDEPS_DIR "${MU_ROOT}/muse_deps")
43+
include(${EXTDEPS_DIR}/buildtools/manifest.cmake)
44+
include(${MUSE_FRAMEWORK_PATH}/buildscripts/cmake/ExtDepsManifest.cmake)
45+
4246
set(GLOBAL_NO_INTERNAL ON)
4347
add_subdirectory(${MUSE_FRAMEWORK_SRC_PATH}/global global)
4448

0 commit comments

Comments
 (0)