From bb474686ebfa42d32ba9250b13c7adb82b414e93 Mon Sep 17 00:00:00 2001 From: John Preston Date: Tue, 22 Jun 2021 09:53:20 +0400 Subject: [PATCH] Use NuGet package for WinRT headers generation. --- CMakeLists.txt | 1 + Telegram/CMakeLists.txt | 7 +------ Telegram/lib_base | 2 +- Telegram/lib_webview | 2 +- cmake | 2 +- 5 files changed, 5 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index cce0c8a455..fef703fc25 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -31,6 +31,7 @@ include(cmake/target_link_static_libraries.cmake) include(cmake/target_link_frameworks.cmake) include(cmake/init_target.cmake) include(cmake/generate_target.cmake) +include(cmake/nuget.cmake) include(cmake/options.cmake) diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt index 0029d6eeb3..b29f795a74 100644 --- a/Telegram/CMakeLists.txt +++ b/Telegram/CMakeLists.txt @@ -82,12 +82,7 @@ PRIVATE desktop-app::external_xxhash ) -if (WIN32) - target_link_libraries(Telegram - PRIVATE - desktop-app::lib_webview_winrt - ) -elseif (LINUX) +if (LINUX) target_link_libraries(Telegram PRIVATE desktop-app::external_glibmm diff --git a/Telegram/lib_base b/Telegram/lib_base index 1042f2e797..2bf446667b 160000 --- a/Telegram/lib_base +++ b/Telegram/lib_base @@ -1 +1 @@ -Subproject commit 1042f2e79738452fcb11639fb4d4c7c0ccb57140 +Subproject commit 2bf446667b6a376c3bd46618bc3df7b733ec03b8 diff --git a/Telegram/lib_webview b/Telegram/lib_webview index 48d70e5258..16f867de7b 160000 --- a/Telegram/lib_webview +++ b/Telegram/lib_webview @@ -1 +1 @@ -Subproject commit 48d70e5258754b2415b07c88f0376212596e09a7 +Subproject commit 16f867de7bbdbc4e2a9a37a07ba1a4618bc067ef diff --git a/cmake b/cmake index e002bba002..545f6bf2ce 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit e002bba00249f284841292c345a3d1de09d83769 +Subproject commit 545f6bf2ce87da7be39f6c818d45df394a5654f5