userver-framework · fdr400 · Jan 6, 2025 · Jan 6, 2025 · Jan 6, 2025 · Jan 6, 2025
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -143,6 +143,11 @@ option(USERVER_FEATURE_OTLP "Provide asynchronous OTLP exporters" "${USERVER_LIB
 
 set(CMAKE_DEBUG_POSTFIX d)
 
+set(OPENSSL_USE_STATIC_LIBS ON)
+set(ZLIB_USE_STATIC_LIBS ON)
+set(Protobuf_USE_STATIC_LIBS ON)
+set(Boost_USE_STATIC_LIBS ON)
+
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
 include(UserverSetupEnvironment)
 userver_setup_environment()

diff --git a/cmake/SetupMongoDeps.cmake b/cmake/SetupMongoDeps.cmake
@@ -0,0 +1,13 @@
+include_guard(GLOBAL)
+
+find_package(bson-1.0 QUIET CONFIG)
+find_package(mongoc-1.0 QUIET CONFIG)
+if(bson-1.0_FOUND AND mongoc-1.0_FOUND)
+  message(STATUS "Using config version for bson + mongoc")
+  add_library(bson ALIAS mongo::bson_static)
+  add_library(mongoc ALIAS mongo::mongoc_static)
+else()
+  find_package(bson REQUIRED)
+  find_package(mongoc REQUIRED)
+endif()
+
diff --git a/cmake/SetupPostgresqlDeps.cmake b/cmake/SetupPostgresqlDeps.cmake
@@ -42,13 +42,16 @@ target_link_libraries(PostgreSQLInternal
     ${USERVER_LIB_MATH}
 )
 
-if(${CMAKE_SYSTEM_NAME} MATCHES "BSD")
-  find_package(libintl REQUIRED)
-  target_link_libraries(PostgreSQLInternal INTERFACE libintl)
+if(${CMAKE_SYSTEM_NAME} MATCHES "BSD" OR ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+  find_package(Intl REQUIRED)
+  if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.20)
+    target_link_libraries(PostgreSQLInternal INTERFACE Intl::Intl)
+  else()
+    target_link_libraries(PostgreSQLInternal INTERFACE ${Intl_LIBRARIES})
+  endif()
 endif()
 
 if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-  find_package(libintl REQUIRED)
   find_package(Iconv REQUIRED)
-  target_link_libraries(PostgreSQLInternal INTERFACE libintl Iconv::Iconv "-framework Foundation")
+  target_link_libraries(PostgreSQLInternal INTERFACE Iconv::Iconv)
 endif()
diff --git a/cmake/SetupProtobuf.cmake b/cmake/SetupProtobuf.cmake
@@ -25,15 +25,14 @@ function(_userver_set_protobuf_version_category)
 endfunction()
 
 if(USERVER_CONAN)
-  find_package(Protobuf REQUIRED)
+  find_package(Protobuf REQUIRED CONFIG)
   _userver_set_protobuf_version_category()
   set(PROTOBUF_PROTOC "${Protobuf_PROTOC_EXECUTABLE}")
   return()
 endif()
 
 if(NOT USERVER_FORCE_DOWNLOAD_PROTOBUF)
   # Use the builtin CMake FindProtobuf
-  set(Protobuf_USE_STATIC_LIBS ON)
   if(USERVER_DOWNLOAD_PACKAGE_PROTOBUF)
     find_package(Protobuf QUIET)
   else()

diff --git a/cmake/SetupRdKafka.cmake b/cmake/SetupRdKafka.cmake
@@ -4,7 +4,7 @@ option(USERVER_DOWNLOAD_PACKAGE_KAFKA "Download and setup librdkafka if no librd
 
 set(USERVER_KAFKA_VERSION "2.3.0")
 
-find_package(OpenSSL COMPONENTS SSL Crypto REQUIRED)
+find_package(OpenSSL REQUIRED)
 find_package(CURL REQUIRED)
 find_package(ZLIB REQUIRED)
 find_package(libzstd REQUIRED)

diff --git a/cmake/UserverSetupEnvironment.cmake b/cmake/UserverSetupEnvironment.cmake
@@ -78,10 +78,6 @@ function(_userver_setup_environment_impl)
     message(STATUS "ccache: disabled")
   endif()
 
-  if(CMAKE_SYSTEM_NAME MATCHES "Darwin" AND NOT USERVER_CONAN)
-    set(Boost_NO_BOOST_CMAKE ON PARENT_SCOPE)
-  endif()
-
   # Build type specific
   if (CMAKE_BUILD_TYPE MATCHES "Debug" OR CMAKE_BUILD_TYPE MATCHES "Test")
     add_compile_definitions(_GLIBCXX_ASSERTIONS)

diff --git a/cmake/modules/FindCrypto.cmake b/cmake/modules/FindCrypto.cmake
diff --git a/cmake/modules/FindCryptoPP.cmake b/cmake/modules/FindCryptoPP.cmake
@@ -13,7 +13,7 @@ _userver_module_find_include(
 )
 
 _userver_module_find_library(
-    NAMES cryptlib cryptopp
+    NAMES libcryptopp.a cryptlib cryptopp
     PATH_SUFFIXES lib
 )
 

diff --git a/cmake/modules/FindHiredis.cmake b/cmake/modules/FindHiredis.cmake
@@ -14,7 +14,7 @@ _userver_module_find_include(
 )
 
 _userver_module_find_library(
-    NAMES hiredis
+    NAMES libhiredis.a hiredis
 )
 
 _userver_module_end()
diff --git a/cmake/modules/FindJemalloc.cmake b/cmake/modules/FindJemalloc.cmake
@@ -19,7 +19,7 @@ _userver_module_find_include(
 )
 
 _userver_module_find_library(
-    NAMES jemalloc
+    NAMES libjemalloc.a jemalloc
 )
 
 _userver_module_end()
diff --git a/cmake/modules/FindLibEv.cmake b/cmake/modules/FindLibEv.cmake
@@ -11,7 +11,7 @@ _userver_module_find_include(
 )
 
 _userver_module_find_library(
-    NAMES ev
+    NAMES libev.a ev
 )
 
 _userver_module_end()
diff --git a/cmake/modules/FindNghttp2.cmake b/cmake/modules/FindNghttp2.cmake
@@ -10,7 +10,7 @@ _userver_module_find_include(
 )
 
 _userver_module_find_library(
-    NAMES nghttp2
+    NAMES libnghttp2.a nghttp2
 )
 
 _userver_module_end()
diff --git a/cmake/modules/FindPugixml.cmake b/cmake/modules/FindPugixml.cmake
@@ -11,7 +11,7 @@ _userver_module_find_include(
 )
 
 _userver_module_find_library(
-  NAMES pugixml libpugixml
+  NAMES libpugixml.a pugixml libpugixml
 )
 
 _userver_module_end()
diff --git a/cmake/modules/FindRdKafka.cmake b/cmake/modules/FindRdKafka.cmake
@@ -12,7 +12,7 @@ _userver_module_find_include(
 )
 
 _userver_module_find_library(
-    NAMES librdkafka.a
+    NAMES librdkafka.a rdkafka
 )
 
 _userver_module_end()
diff --git a/cmake/modules/FindRocksDB.cmake b/cmake/modules/FindRocksDB.cmake
@@ -12,7 +12,7 @@ _userver_module_find_include(
 )
 
 _userver_module_find_library(
-    NAMES librocksdb.a
+    NAMES librocksdb.a rocksdb
 )
 
 _userver_module_end()
diff --git a/cmake/modules/FindSSL.cmake b/cmake/modules/FindSSL.cmake
diff --git a/cmake/modules/Findbson.cmake b/cmake/modules/Findbson.cmake
@@ -17,7 +17,7 @@ _userver_module_find_include(
 )
 
 _userver_module_find_library(
-    NAMES bson bson-1.0
+    NAMES libbson-static-1.0.a bson bson-1.0
 )
 
 _userver_module_end()
diff --git a/cmake/modules/Findc-ares.cmake b/cmake/modules/Findc-ares.cmake
@@ -13,7 +13,7 @@ _userver_module_find_include(
 )
 
 _userver_module_find_library(
-    NAMES libcares.a libcares_static.a libcares.so
+    NAMES libcares.a libcares_static.a cares
 )
 
 _userver_module_end()
diff --git a/cmake/modules/Findcctz.cmake b/cmake/modules/Findcctz.cmake
@@ -12,8 +12,10 @@ _userver_module_find_include(
 )
 
 _userver_module_find_library(
-    NAMES cctz
-    PATHS /usr/lib/x86_64-linux-gnu
+    NAMES libcctz.a cctz
+    PATHS
+      /usr/lib/x86_64-linux-gnu
+      /opt/homebrew/opt/cctz/lib
 )
 
 _userver_module_end()
diff --git a/cmake/modules/Findfmt.cmake b/cmake/modules/Findfmt.cmake
@@ -13,7 +13,7 @@ _userver_module_find_include(
 )
 
 _userver_module_find_library(
-    NAMES fmt
+    NAMES libfmt.a fmt
 )
 
 _userver_module_end()
diff --git a/cmake/modules/Findlibgflags.cmake b/cmake/modules/Findlibgflags.cmake
@@ -16,7 +16,7 @@ _userver_module_find_include(
 )
 
 _userver_module_find_library(
-    NAMES gflags
+    NAMES libgflags.a gflags
     PATH_SUFFIXES lib
 )
 

diff --git a/cmake/modules/Findlibintl.cmake b/cmake/modules/Findlibintl.cmake
diff --git a/cmake/modules/Findlibmariadb.cmake b/cmake/modules/Findlibmariadb.cmake
@@ -11,7 +11,7 @@ _userver_module_find_include(
 )
 
 _userver_module_find_library(
-    NAMES mariadb
+    NAMES libmariadb.a mariadb
     PATH_SUFFIXES lib
 )
 

diff --git a/cmake/modules/Findlibsnappy.cmake b/cmake/modules/Findlibsnappy.cmake
@@ -16,7 +16,7 @@ _userver_module_find_include(
 )
 
 _userver_module_find_library(
-    NAMES snappy
+    NAMES libsnappy.a snappy
     PATH_SUFFIXES lib
 )
 

diff --git a/cmake/modules/Findlibyamlcpp.cmake b/cmake/modules/Findlibyamlcpp.cmake
@@ -13,7 +13,7 @@ _userver_module_find_include(
 )
 
 _userver_module_find_library(
-    NAMES yaml-cpp
+    NAMES libyaml-cpp.a yaml-cpp
     PATH_SUFFIXES lib
 )
 

diff --git a/cmake/modules/Findlibzip.cmake b/cmake/modules/Findlibzip.cmake
@@ -1,7 +1,7 @@
 _userver_module_begin(
     NAME libzip
     DEBIAN_NAMES libbz2-dev
-    FORMULA_NAMES libbz2
+    FORMULA_NAMES bzip2
     RPM_NAMES libbz2-dev
     PACMAN_NAMES bzip2
 )

diff --git a/cmake/modules/Findlibzstd.cmake b/cmake/modules/Findlibzstd.cmake
@@ -15,7 +15,7 @@ _userver_module_find_include(
 )
 
 _userver_module_find_library(
-    NAMES zstd
+    NAMES libzstd.a zstd
     PATH_SUFFIXES lib
 )
 

diff --git a/cmake/modules/Findlz4.cmake b/cmake/modules/Findlz4.cmake
@@ -11,9 +11,11 @@ _userver_module_find_include(
 )
 
 _userver_module_find_library(
-    NAMES liblz4.a
+    NAMES liblz4.a lz4
 )
 
 _userver_module_end()
 
-add_library(lz4::lz4 ALIAS lz4)
+if(NOT TARGET lz4::lz4)
+  add_library(lz4::lz4 ALIAS lz4)
+endif()
diff --git a/cmake/modules/Findmongoc.cmake b/cmake/modules/Findmongoc.cmake
@@ -17,7 +17,7 @@ _userver_module_find_include(
 )
 
 _userver_module_find_library(
-    NAMES mongoc mongoc-1.0
+    NAMES libmongoc-static-1.0.a mongoc mongoc-1.0
 )
 
 _userver_module_end()
diff --git a/mongo/CMakeLists.txt b/mongo/CMakeLists.txt
@@ -8,8 +8,7 @@ if (USERVER_CONAN)
   add_library(mongoc ALIAS mongo::mongoc_static)
   find_package(cyrus-sasl REQUIRED CONFIG)
 else()
-  find_package(bson REQUIRED)
-  find_package(mongoc REQUIRED)
+  include(SetupMongoDeps)
 endif()
 
 userver_module(mongo

diff --git a/mysql/CMakeLists.txt b/mysql/CMakeLists.txt
@@ -1,10 +1,11 @@
 project(userver-mysql CXX)
 
+find_package(ZLIB REQUIRED)
 find_package(libmariadb REQUIRED)
 
 userver_module(mysql
     SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}"
-    LINK_LIBRARIES_PRIVATE libmariadb
+    LINK_LIBRARIES_PRIVATE libmariadb ZLIB::ZLIB
 
     DBTEST_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/tests"
     UTEST_LINK_LIBRARIES libmariadb

diff --git a/scripts/docs/en/deps/alpine.md b/scripts/docs/en/deps/alpine.md
@@ -19,6 +19,8 @@ mariadb-static
 mongo-c-driver-dev
 nghttp2-dev
 openldap-dev
+openssl-dev
+openssl-libs-static
 postgresql16-dev
 protobuf-c-compiler
 protobuf-c-dev
@@ -32,3 +34,5 @@ python3-dev
 snappy-dev
 snappy-static
 yaml-cpp-dev
+zlib-dev
+zlib-static
diff --git a/scripts/docs/en/deps/macos.md b/scripts/docs/en/deps/macos.md
@@ -1,28 +1,27 @@
+ares
+boost
+c-ares
 ccache
+cctz
 cmake
+coreutils
 cyrus-sasl
+fmt
 git
 google-benchmark
-boost
-ares
-cctz
-libev
-fmt
 googletest
 hiredis
 jemalloc
 krb5
+libev
+librdkafka
+mariadb
+mongo-c-driver
 nghttp2
 ninja
-pugixml
 openssl
-yaml-cpp
-librdkafka
-rocksdb
 postgresql@16
-redis
+pugixml
+rocksdb
+yaml-cpp
 zlib
-c-ares
-coreutils
-mongo-c-driver
-mariadb