From af0c81f570282bc5e3dc50b8ff45c9b8bb20fe64 Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Wed, 4 Oct 2023 21:26:09 -0400 Subject: [PATCH] fix(cmake): fix appimage assets directory (#1703) --- cmake/compile_definitions/linux.cmake | 6 ++++++ cmake/packaging/linux.cmake | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cmake/compile_definitions/linux.cmake b/cmake/compile_definitions/linux.cmake index 4f414745..97bd7eb5 100644 --- a/cmake/compile_definitions/linux.cmake +++ b/cmake/compile_definitions/linux.cmake @@ -2,6 +2,12 @@ add_compile_definitions(SUNSHINE_PLATFORM="linux") +# AppImage +if(${SUNSHINE_BUILD_APPIMAGE}) + # use relative assets path for AppImage + string(REPLACE "${CMAKE_INSTALL_PREFIX}" ".${CMAKE_INSTALL_PREFIX}" SUNSHINE_ASSETS_DIR_DEF ${SUNSHINE_ASSETS_DIR}) +endif() + if(NOT DEFINED SUNSHINE_EXECUTABLE_PATH) set(SUNSHINE_EXECUTABLE_PATH "sunshine") endif() diff --git a/cmake/packaging/linux.cmake b/cmake/packaging/linux.cmake index acdf41c1..c36c7c0e 100644 --- a/cmake/packaging/linux.cmake +++ b/cmake/packaging/linux.cmake @@ -1,11 +1,5 @@ # linux specific packaging -# AppImage -if(${SUNSHINE_BUILD_APPIMAGE}) - # use relative assets path for AppImage - string(REPLACE "${CMAKE_INSTALL_PREFIX}" ".${CMAKE_INSTALL_PREFIX}" SUNSHINE_ASSETS_DIR_DEF ${SUNSHINE_ASSETS_DIR}) -endif() - install(DIRECTORY "${SUNSHINE_SOURCE_ASSETS_DIR}/linux/assets/" DESTINATION "${SUNSHINE_ASSETS_DIR}") if(${SUNSHINE_BUILD_APPIMAGE} OR ${SUNSHINE_BUILD_FLATPAK})