RepoMirrors/tdesktop
1
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-02-28 11:30:54 +00:00
Code Issues Projects Releases Wiki Activity

Cmake: Also use /bin subdir for Ninja if the executable does not have a suffxi (e.g. Linux)

Browse Source
This commit is contained in:
John Zimmermann 2020-01-02 18:22:25 +01:00 committed by John Preston
parent f2c8167124
commit 87f44e87cd
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Telegram/CMakeLists.txt
View File

@ -1108,9 +1108,9 @@ PRIVATE
AL_ALEXT_PROTOTYPES 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}) 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) set(output_folder ${CMAKE_BINARY_DIR}/bin)
else() else()
set(output_folder ${CMAKE_BINARY_DIR}/$<IF:$<CONFIG:Debug>,Debug,Release>) set(output_folder ${CMAKE_BINARY_DIR}/$<IF:$<CONFIG:Debug>,Debug,Release>)