mirror of
https://github.com/AyuGram/AyuGramDesktop.git
synced 2026-07-25 06:54:43 +00:00
Use Ninja Multi-Config generator on Linux.
This commit is contained in:
@@ -1399,12 +1399,13 @@ PRIVATE
|
||||
G_LOG_DOMAIN="Telegram"
|
||||
)
|
||||
|
||||
if (APPLE OR NOT CMAKE_EXECUTABLE_SUFFIX STREQUAL "" OR NOT "${output_name}" STREQUAL "Telegram")
|
||||
if ("${CMAKE_GENERATOR}" STREQUAL "Xcode"
|
||||
OR "${CMAKE_GENERATOR}" STREQUAL "Ninja Multi-Config"
|
||||
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)
|
||||
else()
|
||||
set(output_folder ${CMAKE_BINARY_DIR}/$<IF:$<CONFIG:Debug>,Debug,Release>)
|
||||
set(output_folder ${CMAKE_BINARY_DIR}/bin)
|
||||
endif()
|
||||
|
||||
set_target_properties(Telegram PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${output_folder})
|
||||
|
||||
@@ -33,7 +33,7 @@ fi
|
||||
Run ./configure.sh
|
||||
|
||||
cd $ProjectPath
|
||||
Run cmake --build . --config Release --target Telegram -- -j8
|
||||
Run cmake --build . --config Release --target Telegram
|
||||
cd $ReleasePath
|
||||
|
||||
echo "$BinaryName build complete!"
|
||||
|
||||
@@ -59,9 +59,4 @@ if officialTarget != '':
|
||||
arguments.append('-DTDESKTOP_API_HASH=' + apiHashMatch.group(1))
|
||||
if arch != '':
|
||||
arguments.append(arch)
|
||||
finish(run_cmake.run(scriptName, arguments))
|
||||
elif 'linux' in sys.platform:
|
||||
debugCode = run_cmake.run(scriptName, arguments, "Debug")
|
||||
finish(debugCode if debugCode else run_cmake.run(scriptName, arguments, "Release"))
|
||||
else:
|
||||
finish(run_cmake.run(scriptName, arguments))
|
||||
finish(run_cmake.run(scriptName, arguments))
|
||||
|
||||
+1
-1
Submodule cmake updated: 051f7ba4e3...2034686f01
Reference in New Issue
Block a user