From f2f50f23fa236598bc9e6c94016e0edfd72f7a89 Mon Sep 17 00:00:00 2001 From: Mathieu Schroeter Date: Fri, 15 Nov 2024 22:04:14 +0100 Subject: [PATCH] Adapt build to the latest appimagetool --- CMakeLists.txt | 2 +- cmake/LinuxAppImageBuild.cmake | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 02c3252..2985a04 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,7 +39,7 @@ endif () file (GLOB_RECURSE po resources/po/*.po) -if (APPIMAGE_APPRUN_PROGRAM AND APPIMAGE_ASSISTANT_PROGRAM) +if (APPIMAGE_ASSISTANT_PROGRAM) set (USE_APPIMAGE ON) endif () diff --git a/cmake/LinuxAppImageBuild.cmake b/cmake/LinuxAppImageBuild.cmake index 4ebc588..832a603 100644 --- a/cmake/LinuxAppImageBuild.cmake +++ b/cmake/LinuxAppImageBuild.cmake @@ -1,6 +1,5 @@ set (APPIMAGE_ASSISTANT_PROGRAM CACHE FILEPATH "AppImageAssistant executable") -set (APPIMAGE_APPRUN_PROGRAM CACHE FILEPATH "AppImage AppRun executable") set (APPIMAGE_WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/deploy/linux-appimage" CACHE PATH "Where to put the AppDir items") set (APPIMAGE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/package/linux-appimage" CACHE PATH "AppImage output directory") @@ -94,11 +93,6 @@ macro (APPIMAGE_PACKAGE TARGET APPIMAGE_TITLE APPIMAGE_DISPLAYNAME CONFIGDIR DAT "${APPIMAGE_INTERMEDIATE_DIR}/${APPIMAGE_INTERNALNAME}.desktop" @ONLY ) - configure_file ( - "${APPIMAGE_APPRUN_PROGRAM}" - "${APPIMAGE_INTERMEDIATE_DIR}/AppRun" - COPYONLY - ) # Copy resources into AppDir foreach (RESC ${DATA})