feat build: prepare to reuse CMake installed configs in Conan

Tests: протестировано локально и в CI
commit_hash:4de9285654f58dd8222cf10f4bb83770c9a3f0a1

CMakeLists.txt

@@ -205,7 +205,7 @@ endif()
 if (USERVER_FEATURE_POSTGRESQL)
   _require_userver_core("USERVER_FEATURE_POSTGRESQL")
   add_subdirectory(postgresql)
-  list(APPEND USERVER_AVAILABLE_COMPONENTS postgres)
+  list(APPEND USERVER_AVAILABLE_COMPONENTS postgresql)
 endif()
 
 if (USERVER_FEATURE_REDIS)

clickhouse/CMakeLists.txt

@@ -1,7 +1,7 @@
 project(userver-clickhouse CXX)
 
 if (USERVER_CONAN)
-  find_package(clickhouse-cpp REQUIRED)
+  find_package(clickhouse-cpp REQUIRED CONFIG)
   set(CLICKHOUSE_CPP_TARGET clickhouse-cpp-lib::clickhouse-cpp-lib)
 else()
   include(SetupClickhouseCPP)

cmake/install/userver-clickhouse-config.cmake

@@ -8,6 +8,10 @@ find_package(userver REQUIRED COMPONENTS
     core
 )
 
-include("${USERVER_CMAKE_DIR}/modules/Findclickhouse-cpp.cmake")
+if (USERVER_CONAN)
+  find_package(clickhouse-cpp REQUIRED CONFIG)
+else()
+  include("${USERVER_CMAKE_DIR}/modules/Findclickhouse-cpp.cmake")
+endif()
 
 set(userver_clickhouse_FOUND TRUE)

cmake/install/userver-core-config.cmake

@@ -15,13 +15,21 @@ find_package(Boost REQUIRED CONFIG COMPONENTS
 
 find_package(CURL "7.68" REQUIRED)
 find_package(ZLIB REQUIRED)
-find_package(Nghttp2 REQUIRED)
-find_package(LibEv REQUIRED)
 
 include("${USERVER_CMAKE_DIR}/UserverTestsuite.cmake")
-include("${USERVER_CMAKE_DIR}/modules/Findc-ares.cmake")
-if (c-ares_FOUND AND NOT TARGET c-ares::cares)
-  add_library(c-ares::cares ALIAS c-ares)
+
+if (USERVER_CONAN)
+  find_package(c-ares REQUIRED CONFIG)
+  find_package(libnghttp2 REQUIRED CONFIG)
+  find_package(libev REQUIRED CONFIG)
+  find_package(concurrentqueue REQUIRED CONFIG)
+else()
+  include("${USERVER_CMAKE_DIR}/modules/Findc-ares.cmake")
+  if (c-ares_FOUND AND NOT TARGET c-ares::cares)
+    add_library(c-ares::cares ALIAS c-ares)
+  endif()
+  find_package(Nghttp2 REQUIRED)
+  find_package(LibEv REQUIRED)
 endif()
 
 set(userver_core_FOUND TRUE)

cmake/install/userver-kafka-config.cmake

@@ -8,7 +8,11 @@ find_package(userver REQUIRED COMPONENTS
   core
 )
 
-include("${USERVER_CMAKE_DIR}/modules/Findlz4.cmake")
-include("${USERVER_CMAKE_DIR}/modules/FindRdKafka.cmake")
+if(USERVER_CONAN)
+  find_package(RdKafka REQUIRED CONFIG)
+else()
+  include("${USERVER_CMAKE_DIR}/modules/Findlz4.cmake")
+  include("${USERVER_CMAKE_DIR}/modules/FindRdKafka.cmake")
+endif()
 
 set(userver_kafka_FOUND TRUE)

cmake/install/userver-mongo-config.cmake

@@ -8,7 +8,11 @@ find_package(userver REQUIRED COMPONENTS
     core
 )
 
-include("${USERVER_CMAKE_DIR}/modules/Findbson.cmake")
-include("${USERVER_CMAKE_DIR}/modules/Findmongoc.cmake")
+if (USERVER_CONAN)
+  find_package(mongoc-1.0 REQUIRED CONFIG)
+else()
+  include("${USERVER_CMAKE_DIR}/modules/Findbson.cmake")
+  include("${USERVER_CMAKE_DIR}/modules/Findmongoc.cmake")
+endif()
 
 set(userver_mongo_FOUND TRUE)

cmake/install/userver-mysql-config.cmake

@@ -8,6 +8,10 @@ find_package(userver REQUIRED COMPONENTS
     core
 )
 
-include("${USERVER_CMAKE_DIR}/modules/Findlibmariadb.cmake")
+if (USERVER_CONAN)
+  find_package(libmariadb REQUIRED CONFIG)
+else()
+  include("${USERVER_CMAKE_DIR}/modules/Findlibmariadb.cmake")
+endif()
 
 set(userver_mysql_FOUND TRUE)

cmake/install/userver-redis-config.cmake

@@ -8,6 +8,10 @@ find_package(userver REQUIRED COMPONENTS
     core
 )
 
-include("${USERVER_CMAKE_DIR}/modules/FindHiredis.cmake")
+if (USERVER_CONAN)  
+  find_package(hiredis REQUIRED CONFIG)
+else()
+  include("${USERVER_CMAKE_DIR}/modules/FindHiredis.cmake")
+endif()
 
 set(userver_redis_FOUND TRUE)

cmake/install/userver-universal-config.cmake

@@ -26,13 +26,28 @@ if(NOT TARGET fmt)
 endif()
 
 find_package(cctz REQUIRED)
-find_package(CryptoPP REQUIRED)
-find_package(libyamlcpp REQUIRED)
-find_package(libzstd REQUIRED)
+
 if (USERVER_IMPL_FEATURE_JEMALLOC AND
     NOT USERVER_SANITIZE AND
     NOT CMAKE_SYSTEM_NAME MATCHES "Darwin")
-  find_package(Jemalloc REQUIRED)
+
+  if (USERVER_CONAN)
+    find_package(jemalloc REQUIRED CONFIG)
+  else()
+    find_package(Jemalloc REQUIRED)
+  endif()
+endif()
+
+if (USERVER_CONAN)
+  find_package(cryptopp REQUIRED CONFIG)
+  find_package(yaml-cpp REQUIRED CONFIG)
+  find_package(zstd REQUIRED CONFIG)
+
+  find_package(RapidJSON REQUIRED CONFIG)
+else()
+  find_package(CryptoPP REQUIRED)
+  find_package(libyamlcpp REQUIRED)
+  find_package(libzstd REQUIRED)
 endif()
 
 include("${USERVER_CMAKE_DIR}/AddGoogleTests.cmake")

core/CMakeLists.txt

@@ -57,13 +57,13 @@ find_package(Iconv REQUIRED)
 find_package_required(OpenSSL "libssl-dev")
 
 if (USERVER_CONAN)
-    find_package(c-ares REQUIRED)
-    find_package(CURL REQUIRED)
-    find_package(cryptopp REQUIRED)
-    find_package(libnghttp2 REQUIRED)
-    find_package(libev REQUIRED)
+    find_package(c-ares REQUIRED CONFIG)
+    find_package(CURL REQUIRED CONFIG)
+    find_package(cryptopp REQUIRED CONFIG)
+    find_package(libnghttp2 REQUIRED CONFIG)
+    find_package(libev REQUIRED CONFIG)
 
-    find_package(concurrentqueue REQUIRED)
+    find_package(concurrentqueue REQUIRED CONFIG)
 else()
     include(SetupCAres)
     include(SetupCURL)

kafka/CMakeLists.txt

@@ -1,10 +1,20 @@
 project(userver-kafka CXX)
 
 if(USERVER_CONAN)
-  find_package(OpenSSL COMPONENTS SSL Crypto REQUIRED)
-  find_package(CURL REQUIRED)
-  find_package(ZLIB REQUIRED)
-  find_package(RdKafka REQUIRED)
+  find_package(OpenSSL COMPONENTS SSL Crypto REQUIRED CONFIG)
+  find_package(CURL REQUIRED CONFIG)
+  find_package(ZLIB REQUIRED CONFIG)
+
+  find_package(zstd REQUIRED CONFIG)
+  # According to https://conan.io/center/recipes/zstd should be
+  # zstd::libzstd_static, but it does not work that way
+  if (TARGET zstd::libzstd_static)
+    add_library(libzstd ALIAS zstd::libzstd_static)
+  else()
+    add_library(libzstd ALIAS zstd::libzstd_shared)
+  endif()
+
+  find_package(RdKafka REQUIRED CONFIG)
   set_target_properties(RdKafka::rdkafka PROPERTIES IMPORTED_GLOBAL TRUE)
   add_library(RdKafka ALIAS RdKafka::rdkafka)
 else()

mongo/CMakeLists.txt

@@ -1,7 +1,7 @@
 project(userver-mongo CXX)
 
 if (USERVER_CONAN)
-  find_package(mongoc-1.0 REQUIRED)
+  find_package(mongoc-1.0 REQUIRED CONFIG)
   set_target_properties(mongo::bson_static PROPERTIES IMPORTED_GLOBAL TRUE)
   set_target_properties(mongo::mongoc_static PROPERTIES IMPORTED_GLOBAL TRUE)
   add_library(bson ALIAS mongo::bson_static)

redis/CMakeLists.txt

@@ -35,7 +35,7 @@ if(USERVER_FEATURE_REDIS_TLS)
 endif()
 
 if (USERVER_CONAN)
-  find_package(hiredis REQUIRED)
+  find_package(hiredis REQUIRED CONFIG)
   target_link_libraries(${PROJECT_NAME} PUBLIC hiredis::hiredis)
 else()
   find_package(Hiredis REQUIRED)

universal/CMakeLists.txt

@@ -175,7 +175,7 @@ target_compile_definitions(${PROJECT_NAME} PUBLIC
 # https://github.com/jemalloc/jemalloc/issues/820
 if (USERVER_FEATURE_JEMALLOC AND NOT USERVER_SANITIZE AND NOT CMAKE_SYSTEM_NAME MATCHES "Darwin")
   if (USERVER_CONAN)
-    find_package(jemalloc REQUIRED)
+    find_package(jemalloc REQUIRED CONFIG)
     target_link_libraries(${PROJECT_NAME} PUBLIC jemalloc::jemalloc)
   else()
     find_package_required(Jemalloc "libjemalloc-dev")