From 6cf354d516ba6d1d22350c7eb4911647a8480d04 Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Thu, 18 Jan 2018 12:46:58 +0100 Subject: [PATCH] Added additional build definitions for packaged build: * disable all desktop file and schema generators (already included in package). Signed-off-by: Vitaly Zaitsev --- Telegram/CMakeLists.txt | 6 ++++++ kepka.spec | 3 +-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt index 8ebdbe661..63dccf83f 100644 --- a/Telegram/CMakeLists.txt +++ b/Telegram/CMakeLists.txt @@ -7,6 +7,12 @@ if (LINUX) endif() endif() +if (PACKAGED_BUILD) + add_definitions(-DTDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME) + add_definitions(-DTDESKTOP_DISABLE_DESKTOP_FILE_GENERATION) + add_definitions(-DTDESKTOP_DISABLE_UNITY_INTEGRATION) +endif() + ##================================================ ## Codegen Tools ##================================================ diff --git a/kepka.spec b/kepka.spec index 083a73998..3217eb6ca 100644 --- a/kepka.spec +++ b/kepka.spec @@ -31,7 +31,6 @@ BuildRequires: mapbox-variant-devel BuildRequires: ffmpeg-devel >= 3.1 BuildRequires: openal-soft-devel BuildRequires: qt5-qtbase-devel -BuildRequires: libtgvoip-devel BuildRequires: libstdc++-devel BuildRequires: range-v3-devel BuildRequires: openssl-devel @@ -66,7 +65,7 @@ mkdir %{_target_platform} %build # Building application... pushd %{_target_platform} - %cmake -G Ninja -DCMAKE_BUILD_TYPE=Release .. + %cmake -G Ninja -DPACKAGED_BUILD=1 -DCMAKE_BUILD_TYPE=Release .. %ninja_build popd