From 9f6feb67dd1bfb044c95072ce6e262dbde3e9ac5 Mon Sep 17 00:00:00 2001 From: Patryk Osmaczko Date: Fri, 29 Jul 2022 11:12:56 +0200 Subject: [PATCH] fix(cpp): make libraries which are not dynamically loaded static Otherwise, linker will optimize resources registration code on Linux, resulting in resources loading failure. --- resources/CMakeLists.txt | 1 + ui/fonts/CMakeLists.txt | 1 + ui/imports/assets/CMakeLists.txt | 1 + 3 files changed, 3 insertions(+) diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt index bf8ad3b4c7..ed8a533b9c 100644 --- a/resources/CMakeLists.txt +++ b/resources/CMakeLists.txt @@ -16,6 +16,7 @@ qt6_standard_project_setup() qt6_add_qml_module(${PROJECT_NAME} URI Status.StaticConfig VERSION 1.0 + STATIC RESOURCES default-networks.json fleets.json diff --git a/ui/fonts/CMakeLists.txt b/ui/fonts/CMakeLists.txt index f21239e3b8..8e54fae8b9 100644 --- a/ui/fonts/CMakeLists.txt +++ b/ui/fonts/CMakeLists.txt @@ -15,6 +15,7 @@ qt6_standard_project_setup() qt6_add_qml_module(${PROJECT_NAME} URI Status.FontsAssets VERSION 1.0 + STATIC # TODO: temporary until we make qt_target_qml_sources work RESOURCES Inter/Inter-Regular.otf diff --git a/ui/imports/assets/CMakeLists.txt b/ui/imports/assets/CMakeLists.txt index 81f7c3317c..0f899f9665 100644 --- a/ui/imports/assets/CMakeLists.txt +++ b/ui/imports/assets/CMakeLists.txt @@ -15,6 +15,7 @@ qt6_standard_project_setup() qt6_add_qml_module(${PROJECT_NAME} URI Status.UiAssets VERSION 1.0 + STATIC # TODO: temporary until we make qt_target_qml_sources work RESOURCES gif/status_splash_dark.gif