dahjah/Lime3DS
1
0
Fork 0
mirror of https://github.com/Lime3DS/Lime3DS.git synced 2025-12-16 03:58:42 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

cmake: Fixed AppImage build failure caused by upstream changes to linuxdeploy
Some checks failed
citra-build / source (push) Has been cancelled
Details
citra-build / linux (appimage) (push) Has been cancelled
Details
citra-build / linux (fresh) (push) Has been cancelled
Details
citra-build / macos (arm64) (push) Has been cancelled
Details
citra-build / macos (x86_64) (push) Has been cancelled
Details
citra-build / windows (msvc) (push) Has been cancelled
Details
citra-build / windows (msys2) (push) Has been cancelled
Details
citra-build / android (push) Has been cancelled
Details
citra-format / clang-format (push) Has been cancelled
Details
citra-transifex / transifex (push) Has been cancelled
Details
citra-build / macos-universal (push) Has been cancelled
Details

Browse Source 
Also improved error message when linuxdeploy run fails
This commit is contained in:
OpenSauce04 2025-11-28 14:06:42 +00:00 committed by OpenSauce
parent 4cc9792f66
commit e0b8e8440a
1 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
CMakeModules/BundleTarget.cmake
View File

@ -130,25 +130,10 @@ if (BUNDLE_TARGET_EXECUTE)
--icon-file "${CMAKE_BINARY_DIR}/dist/org.azahar_emu.Azahar.svg" --icon-file "${CMAKE_BINARY_DIR}/dist/org.azahar_emu.Azahar.svg"
--desktop-file "${source_path}/dist/${executable_name}.desktop" --desktop-file "${source_path}/dist/${executable_name}.desktop"
--appdir "${appdir_path}" --appdir "${appdir_path}"
RESULT_VARIABLE linuxdeploy_appdir_result) RESULT_VARIABLE linuxdeploy_appdir_result
ERROR_VARIABLE linuxdeploy_appdir_error)
if (NOT linuxdeploy_appdir_result EQUAL "0") if (NOT linuxdeploy_appdir_result EQUAL "0")
message(FATAL_ERROR "linuxdeploy failed to create AppDir: ${linuxdeploy_appdir_result}") message(FATAL_ERROR "linuxdeploy failed to create AppDir w/ exit code ${linuxdeploy_appdir_result}:\n${linuxdeploy_appdir_error}")
endif()
if (enable_qt)
set(qt_hook_file "${appdir_path}/apprun-hooks/linuxdeploy-plugin-qt-hook.sh")
file(READ "${qt_hook_file}" qt_hook_contents)
# Add Cinnamon to list of DEs for GTK3 theming.
string(REPLACE
"*XFCE*"
"*X-Cinnamon*|*XFCE*"
qt_hook_contents "${qt_hook_contents}")
# Wayland backend crashes due to changed schemas in Gnome 40.
string(REPLACE
"export QT_QPA_PLATFORMTHEME=gtk3"
"export QT_QPA_PLATFORMTHEME=gtk3; export GDK_BACKEND=x11"
qt_hook_contents "${qt_hook_contents}")
file(WRITE "${qt_hook_file}" "${qt_hook_contents}")
endif() endif()
message(STATUS "Creating AppImage for executable ${executable_path}") message(STATUS "Creating AppImage for executable ${executable_path}")