Updated cmake sources to TDesktop version 2.4.3

external/ffmpeg/CMakeLists.txt

@@ -68,13 +68,13 @@ else()
             va-drm
             va
             vdpau
-            Xi
+            wayland-client
             Xext
             Xfixes
-            Xrender
         )
         target_link_libraries(external_ffmpeg
         INTERFACE
+            X11
             drm
             pthread
         )

external/qt/CMakeLists.txt

@@ -335,17 +335,13 @@ else()
             wayland-egl
             wayland-cursor
             wayland-client
-            xcb-shm
-            xcb-xfixes
-            xcb-render
             xkbcommon
             xkbcommon-x11
+            Xi
+            Xext
+            Xfixes
             Xrender
             ffi
-            icutu
-            icui18n
-            icuuc
-            icudata
         )
         if (DESKTOP_APP_USE_GLIBC_WRAPS)
             target_link_libraries(external_qt
@@ -356,6 +352,7 @@ else()
         endif()
         target_link_libraries(external_qt
         INTERFACE
+            desktop-app::external_zlib
             ICE
             SM
             fontconfig

init_target.cmake

@@ -5,7 +5,7 @@
 # https://github.com/desktop-app/legal/blob/master/LEGAL
 
 set(MAXIMUM_CXX_STANDARD cxx_std_20)
-if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
     set(MAXIMUM_CXX_STANDARD cxx_std_17)
 endif()
 

options_mac.cmake

@@ -38,6 +38,7 @@ INTERFACE
     -Wno-sign-compare
     -Wno-unknown-attributes
     -Wno-pragma-system-header-outside-header
+    -Wno-range-loop-analysis
 )
 
 if (DESKTOP_APP_SPECIAL_TARGET)

options_win.cmake

@@ -86,7 +86,6 @@ INTERFACE
     Version
     Dwmapi
     Wtsapi32
-    Rstrtmgr
     Crypt32
 )