From 87f44e87cd51df10d9db132b2a66a58ec623911f Mon Sep 17 00:00:00 2001 From: John Zimmermann Date: Thu, 2 Jan 2020 18:22:25 +0100 Subject: [PATCH] Cmake: Also use /bin subdir for Ninja if the executable does not have a suffxi (e.g. Linux) --- Telegram/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt index 8e6f8648d..b262f1a7b 100644 --- a/Telegram/CMakeLists.txt +++ b/Telegram/CMakeLists.txt @@ -1108,9 +1108,9 @@ PRIVATE AL_ALEXT_PROTOTYPES ) -if (${CMAKE_GENERATOR} MATCHES "(Visual Studio|Xcode|Ninja)") +if ((${CMAKE_GENERATOR} MATCHES "(Visual Studio|Xcode)") OR ((${CMAKE_GENERATOR} MATCHES "(Ninja)") AND NOT ${CMAKE_EXECUTABLE_SUFFIX} STREQUAL "")) set(output_folder ${CMAKE_BINARY_DIR}) -elseif((${CMAKE_GENERATOR} MATCHES "(Unix Makefiles)") AND DESKTOP_APP_SPECIAL_TARGET STREQUAL "") +elseif((${CMAKE_GENERATOR} MATCHES "(Unix Makefiles|Ninja)") AND DESKTOP_APP_SPECIAL_TARGET STREQUAL "") set(output_folder ${CMAKE_BINARY_DIR}/bin) else() set(output_folder ${CMAKE_BINARY_DIR}/$,Debug,Release>)