From 249f0890dff2f3a0e3677affacc0bd23dd3b68c6 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Wed, 31 May 2023 08:28:00 +0400 Subject: [PATCH] Add implib support --- CMakeLists.txt | 7 ++++--- cmake | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e456192cd4..2979473c4c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,9 +19,9 @@ include(cmake/validate_special_target.cmake) include(cmake/version.cmake) desktop_app_parse_version(Telegram/build/version) -set(project_langs C CXX) +set(project_langs ASM C CXX) if (APPLE) - set(project_langs C CXX OBJC OBJCXX) + list(APPEND project_langs OBJC OBJCXX) endif() project(Telegram @@ -43,9 +43,10 @@ endif() include(cmake/variables.cmake) include(cmake/nice_target_sources.cmake) include(cmake/target_compile_options_if_exists.cmake) +include(cmake/target_link_frameworks.cmake) +include(cmake/target_link_optional_libraries.cmake) include(cmake/target_link_options_if_exists.cmake) 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) diff --git a/cmake b/cmake index 92e35993aa..ae0986c9ef 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 92e35993aa437ee212f677c96a717078124cfd65 +Subproject commit ae0986c9efd28c61783cfe106f8bd1b0ba3b3920