From 5d8ac95d07e38adac8632c7d39f15dd17568e8e7 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Tue, 13 May 2025 09:42:16 +0000 Subject: [PATCH] Prepend PkgConfig variables with TDESKTOP_ To avoid clashes with cache variables set by third party cmake modules --- Telegram/cmake/lib_tgvoip.cmake | 6 +++--- Telegram/lib_spellcheck | 2 +- cmake | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Telegram/cmake/lib_tgvoip.cmake b/Telegram/cmake/lib_tgvoip.cmake index c7c21555a8..f6d80daca7 100644 --- a/Telegram/cmake/lib_tgvoip.cmake +++ b/Telegram/cmake/lib_tgvoip.cmake @@ -10,11 +10,11 @@ add_library(tdesktop::lib_tgvoip ALIAS lib_tgvoip) if (DESKTOP_APP_USE_PACKAGED) find_package(PkgConfig) if (PkgConfig_FOUND) - pkg_check_modules(TGVOIP IMPORTED_TARGET tgvoip) + pkg_check_modules(TDESKTOP_TGVOIP IMPORTED_TARGET tgvoip) endif() - if (TGVOIP_FOUND) - target_link_libraries(lib_tgvoip INTERFACE PkgConfig::TGVOIP) + if (TDESKTOP_TGVOIP_FOUND) + target_link_libraries(lib_tgvoip INTERFACE PkgConfig::TDESKTOP_TGVOIP) return() endif() endif() diff --git a/Telegram/lib_spellcheck b/Telegram/lib_spellcheck index 8809cc72d0..73dba37d0a 160000 --- a/Telegram/lib_spellcheck +++ b/Telegram/lib_spellcheck @@ -1 +1 @@ -Subproject commit 8809cc72d07087ec61a1e8569de4da95aac45474 +Subproject commit 73dba37d0a7e0def17889091498a99d1057f961d diff --git a/cmake b/cmake index 8647b77e25..953b950b6a 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 8647b77e253a8d57ec300ce3b5962dddca0cdfb5 +Subproject commit 953b950b6aed53ce8d4695e998ff72c258dd24b1