Updated cmake sources to TDesktop version 2.8.11+b2c762e

external/angle/CMakeLists.txt

@@ -8,7 +8,7 @@ add_library(external_angle INTERFACE IMPORTED GLOBAL)
 add_library(desktop-app::external_angle ALIAS external_angle)
 
 if (WIN32)
-    target_include_directories(external_angle
+    target_include_directories(external_angle SYSTEM
     INTERFACE
         ${libs_loc}/tg_angle/include
     )

external/auto_updates/xz/CMakeLists.txt

@@ -11,7 +11,7 @@ if (DESKTOP_APP_USE_PACKAGED)
     find_package(LibLZMA REQUIRED)
     target_link_libraries(external_xz INTERFACE LibLZMA::LibLZMA)
 elseif (APPLE AND NOT build_osx)
-    target_include_directories(external_xz
+    target_include_directories(external_xz SYSTEM
     INTERFACE
         /usr/local/macos/include
     )
@@ -20,7 +20,7 @@ elseif (APPLE AND NOT build_osx)
         /usr/local/macos/lib/liblzma.a
     )
 elseif (APPLE)
-    target_include_directories(external_xz
+    target_include_directories(external_xz SYSTEM
     INTERFACE
         /usr/local/include
     )

external/fcitx5_qt5/CMakeLists.txt

@@ -67,7 +67,7 @@ else()
         find_package(PkgConfig REQUIRED)
         pkg_check_modules(XKBCOMMON REQUIRED xkbcommon)
 
-        target_include_directories(external_fcitx5_qt5
+        target_include_directories(external_fcitx5_qt5 SYSTEM
         PUBLIC
             ${XKBCOMMON_INCLUDE_DIRS}
         )

external/ffmpeg/CMakeLists.txt

@@ -17,7 +17,7 @@ if (DESKTOP_APP_USE_PACKAGED)
     pkg_check_modules(SWRESAMPLE REQUIRED IMPORTED_TARGET libswresample)
 
     if (DESKTOP_APP_USE_PACKAGED_FFMPEG_STATIC)
-        target_include_directories(external_ffmpeg
+        target_include_directories(external_ffmpeg SYSTEM
         INTERFACE
             ${AVCODEC_STATIC_INCLUDE_DIRS}
             ${AVFORMAT_STATIC_INCLUDE_DIRS}

external/glib/CMakeLists.txt

@@ -22,7 +22,7 @@ if (DESKTOP_APP_USE_PACKAGED)
         PkgConfig::GLIB2
     )
 else()
-    target_include_directories(external_glib
+    target_include_directories(external_glib SYSTEM
     INTERFACE
         ${GIO_UNIX_INCLUDE_DIRS}
         ${GIO_INCLUDE_DIRS}

external/glibmm/CMakeLists.txt

@@ -18,7 +18,7 @@ if (DESKTOP_APP_USE_PACKAGED)
         PkgConfig::GLIBMM
     )
 else()
-    target_include_directories(external_glibmm
+    target_include_directories(external_glibmm SYSTEM
     INTERFACE
         ${GIOMM_INCLUDE_DIRS}
         ${GLIBMM_INCLUDE_DIRS}

external/hime_qt/hime_im_client/CMakeLists.txt

@@ -84,7 +84,7 @@ else()
     else()
         pkg_check_modules(X11 REQUIRED x11)
 
-        target_include_directories(external_hime_im_client
+        target_include_directories(external_hime_im_client SYSTEM
         PRIVATE
             ${X11_INCLUDE_DIRS}
         )

external/jemalloc/CMakeLists.txt

@@ -35,7 +35,7 @@ if (NOT JEMALLOC_FOUND)
         IMPORTED_LOCATION "${BINARY_DIR}/lib/libjemalloc.a"
     )
 
-    target_include_directories(external_jemalloc_bundled
+    target_include_directories(external_jemalloc_bundled SYSTEM
     INTERFACE
         ${SOURCE_DIR}/include
     )

external/jpeg/CMakeLists.txt

@@ -11,7 +11,7 @@ if (DESKTOP_APP_USE_PACKAGED)
     find_package(JPEG)
     target_link_libraries(external_jpeg INTERFACE JPEG::JPEG)
 elseif (WIN32)
-    target_include_directories(external_jpeg INTERFACE ${libs_loc}/mozjpeg)
+    target_include_directories(external_jpeg SYSTEM INTERFACE ${libs_loc}/mozjpeg)
     target_link_libraries(external_jpeg INTERFACE ${libs_loc}/mozjpeg/$<IF:$<CONFIG:Debug>,Debug,Release>/jpeg-static.lib)
 elseif (APPLE AND NOT build_osx)
     target_link_libraries(external_jpeg INTERFACE /usr/local/macos/lib/libjpeg.a)

external/kwayland/CMakeLists.txt

@@ -19,7 +19,7 @@ else()
         IMPORTED_LOCATION "${KWAYLAND_LIBRARY}"
     )
 
-    target_include_directories(external_kwayland
+    target_include_directories(external_kwayland SYSTEM
     INTERFACE
         /usr/local/include/KF5
         /usr/local/include/KF5/KWayland/Client

external/openal/CMakeLists.txt

@@ -10,7 +10,7 @@ add_library(desktop-app::external_openal ALIAS external_openal)
 if (DESKTOP_APP_USE_PACKAGED)
     find_package(OpenAL)
     if (OPENAL_FOUND)
-        target_include_directories(external_openal INTERFACE ${OPENAL_INCLUDE_DIR})
+        target_include_directories(external_openal SYSTEM INTERFACE ${OPENAL_INCLUDE_DIR})
         target_link_libraries(external_openal INTERFACE ${OPENAL_LIBRARY})
     else()
         find_package(PkgConfig REQUIRED)

external/opus/CMakeLists.txt

@@ -17,7 +17,7 @@ else()
     add_library(desktop-app::external_opus ALIAS external_opus)
 
     if (WIN32)
-        target_include_directories(external_opus
+        target_include_directories(external_opus SYSTEM
         INTERFACE
             ${libs_loc}/opus/include
         )
@@ -32,7 +32,7 @@ else()
             IMPORTED_LOCATION_DEBUG "${opus_lib_loc}/Debug/opus.lib"
         )
     elseif (APPLE AND NOT build_osx)
-        target_include_directories(external_opus
+        target_include_directories(external_opus SYSTEM
         INTERFACE
             /usr/local/macos/include/opus
         )
@@ -40,7 +40,7 @@ else()
             IMPORTED_LOCATION /usr/local/macos/lib/libopus.a
         )
     elseif (APPLE)
-        target_include_directories(external_opus
+        target_include_directories(external_opus SYSTEM
         INTERFACE
             /usr/local/include/opus
         )
@@ -48,7 +48,7 @@ else()
             IMPORTED_LOCATION /usr/local/lib/libopus.a
         )
     else()
-        target_include_directories(external_opus
+        target_include_directories(external_opus SYSTEM
         INTERFACE
             /usr/local/include/opus
         )

external/qr_code_generator/CMakeLists.txt

@@ -12,7 +12,7 @@ if (DESKTOP_APP_USE_PACKAGED)
     find_path(QRCODE_INCLUDE_DIRS QrCode.hpp PATH_SUFFIXES qrcodegencpp qrcodegen)
 
     if (QRCODE_LIBRARIES AND QRCODE_INCLUDE_DIRS)
-        target_include_directories(external_qr_code_generator INTERFACE ${QRCODE_INCLUDE_DIRS})
+        target_include_directories(external_qr_code_generator SYSTEM INTERFACE ${QRCODE_INCLUDE_DIRS})
         target_link_libraries(external_qr_code_generator INTERFACE ${QRCODE_LIBRARIES})
     endif()
 endif()

external/qt/CMakeLists.txt

@@ -18,7 +18,7 @@ if (DESKTOP_APP_USE_PACKAGED)
         Qt5::Network
     )
 
-    target_include_directories(external_qt
+    target_include_directories(external_qt SYSTEM
     INTERFACE
         ${Qt5Core_PRIVATE_INCLUDE_DIRS}
         ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
@@ -31,7 +31,7 @@ if (DESKTOP_APP_USE_PACKAGED)
     if (Qt5XkbCommonSupport_FOUND)
         target_link_libraries(external_qt INTERFACE Qt5::XkbCommonSupport)
 
-        target_include_directories(external_qt
+        target_include_directories(external_qt SYSTEM
         INTERFACE
             ${Qt5XkbCommonSupport_PRIVATE_INCLUDE_DIRS}
         )
@@ -40,7 +40,7 @@ if (DESKTOP_APP_USE_PACKAGED)
     if (Qt5WaylandClient_FOUND)
         target_link_libraries(external_qt INTERFACE Qt5::WaylandClient)
 
-        target_include_directories(external_qt
+        target_include_directories(external_qt SYSTEM
         INTERFACE
             ${Qt5WaylandClient_PRIVATE_INCLUDE_DIRS}
         )

external/rlottie/CMakeLists.txt

@@ -22,7 +22,12 @@ if (DESKTOP_APP_USE_PACKAGED)
     endif()
 endif()
 
-if (NOT rlottie_FOUND AND NOT RLOTTIE_FOUND)
+if (rlottie_FOUND OR RLOTTIE_FOUND)
+    target_compile_definitions(external_rlottie
+    INTERFACE
+        DESKTOP_APP_USE_PACKAGED_RLOTTIE
+    )
+else()
     add_library(external_rlottie_bundled STATIC)
     init_target(external_rlottie_bundled "(external)")
 

external/rnnoise/CMakeLists.txt

@@ -18,7 +18,7 @@ else()
 
     set(rnnoise_lib_loc ${libs_loc}/rnnoise/out)
     if (WIN32)
-        target_include_directories(external_rnnoise
+        target_include_directories(external_rnnoise SYSTEM
         INTERFACE
             ${libs_loc}/rnnoise/include
         )
@@ -27,7 +27,7 @@ else()
             IMPORTED_LOCATION_DEBUG "${rnnoise_lib_loc}/Debug/rnnoise.lib"
         )
     elseif (APPLE)
-        target_include_directories(external_rnnoise
+        target_include_directories(external_rnnoise SYSTEM
         INTERFACE
             ${libs_loc}/rnnoise/include
         )
@@ -36,7 +36,7 @@ else()
             IMPORTED_LOCATION_DEBUG "${rnnoise_lib_loc}/Debug/librnnoise.a"
         )
     else()
-        target_include_directories(external_rnnoise
+        target_include_directories(external_rnnoise SYSTEM
         INTERFACE
             /usr/local/include
         )

external/ton/CMakeLists.txt

@@ -17,7 +17,7 @@ else()
     set(ton_lib_suffix .a)
 endif()
 
-target_include_directories(external_ton
+target_include_directories(external_ton SYSTEM
 INTERFACE
     ${ton_loc}
     ${ton_loc}/crypto

external/webrtc/CMakeLists.txt

@@ -59,7 +59,7 @@ else()
         )
     endif()
 
-    target_include_directories(external_webrtc
+    target_include_directories(external_webrtc SYSTEM
     INTERFACE
         ${webrtc_loc}
         ${webrtc_loc}/third_party/abseil-cpp
@@ -70,7 +70,7 @@ else()
         ${webrtc_lib_prefix}tg_owt
     )
     if (APPLE)
-        target_include_directories(external_webrtc
+        target_include_directories(external_webrtc SYSTEM
         INTERFACE
             ${webrtc_loc}/sdk/objc
             ${webrtc_loc}/sdk/objc/base

external/xxhash/CMakeLists.txt

@@ -12,7 +12,7 @@ if (DESKTOP_APP_USE_PACKAGED)
     find_path(XXHASH_INCLUDE_DIRS xxhash.h)
 
     if (XXHASH_LIBRARY AND XXHASH_INCLUDE_DIRS)
-        target_include_directories(external_xxhash INTERFACE ${XXHASH_INCLUDE_DIRS})
+        target_include_directories(external_xxhash SYSTEM INTERFACE ${XXHASH_INCLUDE_DIRS})
         target_link_libraries(external_xxhash INTERFACE ${XXHASH_LIBRARY})
     endif()
 endif()

external/zlib/CMakeLists.txt

@@ -12,7 +12,7 @@ if (DESKTOP_APP_USE_PACKAGED)
     target_link_libraries(external_zlib INTERFACE ZLIB::ZLIB)
 elseif (WIN32)
     target_compile_definitions(external_zlib INTERFACE ZLIB_WINAPI)
-    target_include_directories(external_zlib INTERFACE ${libs_loc}/zlib)
+    target_include_directories(external_zlib SYSTEM INTERFACE ${libs_loc}/zlib)
     if (build_win64)
         set(zlib_config_folder x64)
     else()

linux_gtk_helper/CMakeLists.txt

@@ -21,4 +21,4 @@ PUBLIC
 
 find_package(PkgConfig REQUIRED)
 pkg_check_modules(GTK REQUIRED gtk+-3.0)
-target_include_directories(linux_gtk_helper PRIVATE ${GTK_INCLUDE_DIRS})
+target_include_directories(linux_gtk_helper SYSTEM PRIVATE ${GTK_INCLUDE_DIRS})

options.cmake

@@ -63,6 +63,13 @@ if (DESKTOP_APP_USE_PACKAGED_LAZY)
     )
 endif()
 
+if (DESKTOP_APP_DISABLE_WEBKITGTK)
+    target_compile_definitions(common_options
+    INTERFACE
+        DESKTOP_APP_DISABLE_WEBKITGTK
+    )
+endif()
+
 if (DESKTOP_APP_USE_PACKAGED_FONTS)
     target_compile_definitions(common_options
     INTERFACE
@@ -70,13 +77,6 @@ if (DESKTOP_APP_USE_PACKAGED_FONTS)
     )
 endif()
 
-if (rlottie_FOUND OR RLOTTIE_FOUND)
-    target_compile_definitions(common_options
-    INTERFACE
-        DESKTOP_APP_USE_PACKAGED_RLOTTIE
-    )
-endif()
-
 if (NOT DESKTOP_APP_SPECIAL_TARGET STREQUAL "")
     target_compile_definitions(common_options
     INTERFACE

options_linux.cmake

@@ -11,25 +11,16 @@ INTERFACE
     -pipe
     -Wall
     -W
-    -Wno-unused-variable
     -Wno-unused-parameter
-    -Wno-unused-function
     -Wno-switch
-    -Wno-comment
     -Wno-missing-field-initializers
     -Wno-sign-compare
-    -Wno-attributes
-    -Wno-parentheses
-    $<$<NOT:$<COMPILE_LANGUAGE:C>>:-Wno-register>
 )
 
 if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
     target_compile_options(common_options
     INTERFACE
-        -Wno-unused-but-set-variable
-        -Wno-stringop-overflow
         -Wno-maybe-uninitialized
-        -Wno-error=class-memaccess
     )
 endif()
 

options_mac.cmake

@@ -15,7 +15,7 @@ else()
         )
     endif()
     if (NOT DESKTOP_APP_USE_PACKAGED)
-        target_include_directories(common_options
+        target_include_directories(common_options SYSTEM
         INTERFACE
             /usr/local/macos/include
         )

variables.cmake

@@ -37,6 +37,7 @@ option(DESKTOP_APP_USE_PACKAGED "Find libraries using CMake instead of exact pat
 option(DESKTOP_APP_USE_PACKAGED_LAZY "Bundle recommended Qt plugins for self-contained packages. (Linux only)" OFF)
 option(DESKTOP_APP_USE_PACKAGED_FFMPEG_STATIC "Link ffmpeg statically in packaged mode." OFF)
 option(DESKTOP_APP_DISABLE_SPELLCHECK "Disable spellcheck library." ${osx_special_target})
+option(DESKTOP_APP_DISABLE_WEBKITGTK "Disable WebKitGTK library (Linux only)." OFF)
 option(DESKTOP_APP_DISABLE_CRASH_REPORTS "Disable crash report generation." ${no_special_target})
 option(DESKTOP_APP_DISABLE_AUTOUPDATE "Disable autoupdate." ${disable_autoupdate})
 option(DESKTOP_APP_USE_HUNSPELL_ONLY "Disable system spellchecker and use bundled Hunspell only. (For debugging purposes)" OFF)