From 6351454759e0a9cacaf04e993c7a1cbceed4a165 Mon Sep 17 00:00:00 2001 From: Tobias Fella Date: Fri, 25 Dec 2020 17:59:50 +0100 Subject: [PATCH] CMake Cleanup --- CMakeLists.txt | 4 +++- cmake/Flatpak.cmake | 5 ----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6b9a6ca2d..82ffd9053 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,7 +20,9 @@ include(KDEClangFormat) include(KDECMakeSettings) include(KDECompilerSettings NO_POLICY_SCOPE) -include(cmake/Flatpak.cmake) +if(NEOCHAT_FLATPAK) + include(cmake/Flatpak.cmake) +endif() # Fix a crash due to problems with quotient's event system. Can probably be removed once the reworked event system is in cmake_policy(SET CMP0063 OLD) diff --git a/cmake/Flatpak.cmake b/cmake/Flatpak.cmake index 3262a7dbd..e73d39531 100644 --- a/cmake/Flatpak.cmake +++ b/cmake/Flatpak.cmake @@ -1,8 +1,3 @@ -if(NOT NEOCHAT_FLATPAK) - # Only include this if we build a Flatpak - return() -endif() - include(GNUInstallDirs) # Include FontConfig config which uses the Emoji One font from the