diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index 44e5d26d4..dc71724c2 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -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})
diff --git a/Telegram/build/docker/build.sh b/Telegram/build/docker/build.sh
index 54b00360b..a85e4894f 100755
--- a/Telegram/build/docker/build.sh
+++ b/Telegram/build/docker/build.sh
@@ -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!"
diff --git a/Telegram/configure.py b/Telegram/configure.py
index 5f4349132..22de084a5 100644
--- a/Telegram/configure.py
+++ b/Telegram/configure.py
@@ -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))
diff --git a/cmake b/cmake
index 051f7ba4e..2034686f0 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 051f7ba4e38226797bafbd9c1ed52ef38afe28b9
+Subproject commit 2034686f01d2207bde5b060e71a416f2f4419287