From 3dfd60df3093c6d9ed1cad18c7f7f075c4897f7c Mon Sep 17 00:00:00 2001 From: antoshkka Date: Fri, 27 Dec 2024 19:30:37 +0300 Subject: [PATCH] feat conan: fixes for CMake config files reusage MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Tests: протестировано локально commit_hash:6bc4d1bc64dfe05268f75a37ee3c46c6a9e7f44b --- kafka/CMakeLists.txt | 3 +++ mongo/CMakeLists.txt | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/kafka/CMakeLists.txt b/kafka/CMakeLists.txt index 241f878f8308..06bb49305dfa 100644 --- a/kafka/CMakeLists.txt +++ b/kafka/CMakeLists.txt @@ -17,6 +17,9 @@ if(USERVER_CONAN) find_package(RdKafka REQUIRED CONFIG) set_target_properties(RdKafka::rdkafka PROPERTIES IMPORTED_GLOBAL TRUE) add_library(RdKafka ALIAS RdKafka::rdkafka) + + find_package(cyrus-sasl REQUIRED CONFIG) + add_library(sasl2 ALIAS cyrus-sasl::cyrus-sasl) else() include(SetupRdKafka) endif() diff --git a/mongo/CMakeLists.txt b/mongo/CMakeLists.txt index 2df0ef4ee235..9e5b99837f87 100644 --- a/mongo/CMakeLists.txt +++ b/mongo/CMakeLists.txt @@ -6,7 +6,7 @@ if (USERVER_CONAN) set_target_properties(mongo::mongoc_static PROPERTIES IMPORTED_GLOBAL TRUE) add_library(bson ALIAS mongo::bson_static) add_library(mongoc ALIAS mongo::mongoc_static) - find_package(cyrus-sasl REQUIRED) + find_package(cyrus-sasl REQUIRED CONFIG) else() find_package(bson REQUIRED) find_package(mongoc REQUIRED)