From 4482916f1a08e416b12f08b321802c3b2548d721 Mon Sep 17 00:00:00 2001 From: ilya-fedin Date: Sun, 25 Jul 2021 14:50:23 +0000 Subject: [PATCH] Fix Info.plist, part 2 (#199) Since cmake processes plist file at configure stage, generator expressions couldn't be resolved, so remove them. This also removes unneeded code path with "Kotatogram Lite" (since Kotatogram doesn't need to differ from some other app) --- Telegram/CMakeLists.txt | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt index e2aaad8d8..d29dc9b87 100644 --- a/Telegram/CMakeLists.txt +++ b/Telegram/CMakeLists.txt @@ -1320,10 +1320,15 @@ elseif (APPLE) endif() endif() +set(bundle_identifier "io.github.kotatogram") +if (LINUX AND DESKTOP_APP_USE_PACKAGED) + set(output_name "kotatogram-desktop") +else() + set(output_name "Kotatogram") +endif() + if (build_macstore) - set(bundle_identifier "io.github.kotatogram") set(bundle_entitlements "Telegram Lite.entitlements") - set(output_name "Kotatogram Lite") set_target_properties(Telegram PROPERTIES XCODE_ATTRIBUTE_FRAMEWORK_SEARCH_PATHS ${libs_loc}/breakpad/src/client/mac/build/Release ) @@ -1334,18 +1339,8 @@ if (build_macstore) COMMAND mkdir -p $/../Frameworks COMMAND cp -a ${libs_loc}/breakpad/src/client/mac/build/Release/Breakpad.framework $/../Frameworks/Breakpad.framework ) -elseif (build_osx) - set(bundle_identifier "io.github.kotatogram$<$:DebugOsx>") - set(bundle_entitlements "Telegram.entitlements") - set(output_name "Kotatogram") else() - set(bundle_identifier "io.github.kotatogram$<$:Debug>") set(bundle_entitlements "Telegram.entitlements") - if (LINUX AND DESKTOP_APP_USE_PACKAGED) - set(output_name "kotatogram-desktop") - else() - set(output_name "Kotatogram") - endif() endif() set_target_properties(Telegram PROPERTIES