From 6ae749a12f1a0e05a5d6958ef05b7a67b19cf585 Mon Sep 17 00:00:00 2001 From: Joshua Goins Date: Mon, 27 May 2024 16:36:35 -0400 Subject: [PATCH] Don't deploy applications on Flatpak --- CMakeLists.txt | 3 +++ apps/sdklauncher/CMakeLists.txt | 17 ++++++++++------- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 087fe30..1dfd10d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,6 +4,9 @@ cmake_minimum_required(VERSION 3.25) project(Novus VERSION 0.1.0 LANGUAGES CXX) +# build options used for distributors +option(BUILD_FLATPAK "Build for Flatpak." OFF) + set(CMAKE_CXX_STANDARD 20) set(CMAKE_CXX_STANDARD_REQUIRED ON) diff --git a/apps/sdklauncher/CMakeLists.txt b/apps/sdklauncher/CMakeLists.txt index 0d29308..36f3f36 100644 --- a/apps/sdklauncher/CMakeLists.txt +++ b/apps/sdklauncher/CMakeLists.txt @@ -65,10 +65,13 @@ ecm_add_app_icon(novus-launcher ${CMAKE_SOURCE_DIR}/resources/256-launcher.png ) -# We only need to call deploy on one executable -qt_generate_deploy_app_script( - TARGET novus-launcher - OUTPUT_SCRIPT deploy_script - NO_UNSUPPORTED_PLATFORM_ERROR -) -install(SCRIPT ${deploy_script}) \ No newline at end of file +# the current tooling completely breaks in Flatpak, and is unnecessary there anyway +if (NOT BUILD_FLATPAK) + # We only need to call deploy on one executable + qt_generate_deploy_app_script( + TARGET novus-launcher + OUTPUT_SCRIPT deploy_script + NO_UNSUPPORTED_PLATFORM_ERROR + ) + install(SCRIPT ${deploy_script}) +endif() \ No newline at end of file