From 000a7ae28bfaddb1a6e935c38c2812c389a0f6a0 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Mon, 13 Jul 2020 09:28:47 +0400 Subject: [PATCH] Choose output folder based on executable name and extension instead of generator name --- Telegram/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt index f2be39eb9..93b483087 100644 --- a/Telegram/CMakeLists.txt +++ b/Telegram/CMakeLists.txt @@ -1271,7 +1271,7 @@ PRIVATE TDESKTOP_API_HASH=${TDESKTOP_API_HASH} ) -if (${CMAKE_GENERATOR} MATCHES "(Visual Studio|Xcode)") +if (APPLE OR NOT CMAKE_EXECUTABLE_SUFFIX STREQUAL "" OR NOT "${output_name}" STREQUAL "Telegram") set(output_folder ${CMAKE_BINARY_DIR}) elseif (DESKTOP_APP_SPECIAL_TARGET STREQUAL "") set(output_folder ${CMAKE_BINARY_DIR}/bin)