Try fix MacOS

userver-framework · Jan 6, 2025 · c921d2e · c921d2e
1 parent ce2ef8a
commit c921d2e
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 2 deletions.
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -44,6 +44,7 @@ jobs:
                 brew install lld
 
                 brew link postgresql@16
+                brew link --force zlib
 
                 brew upgrade
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -147,6 +147,7 @@ set(OPENSSL_USE_STATIC_LIBS ON)
 set(ZLIB_USE_STATIC_LIBS ON)
 set(Protobuf_USE_STATIC_LIBS ON)
 set(Boost_USE_STATIC_LIBS ON)
+set(CURL_USE_STATIC_LIBS ON)
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
 include(UserverSetupEnvironment)

diff --git a/cmake/modules/FindUserverGBench.cmake b/cmake/modules/FindUserverGBench.cmake
@@ -13,11 +13,11 @@ _userver_module_find_include(
 )
 
 _userver_module_find_library(
-    NAMES benchmark_main
+    NAMES libbenchmark_main.a benchmark_main
 )
 
 _userver_module_find_library(
-    NAMES benchmark
+    NAMES libbenchmark.a benchmark
 )
 
 _userver_module_end()
diff --git a/scripts/docs/en/deps/alpine.md b/scripts/docs/en/deps/alpine.md
@@ -22,6 +22,7 @@ mariadb-static
 mongo-c-driver-dev
 mongo-c-driver-static
 nghttp2-dev
+nghttp2-static
 openldap-dev
 openssl-dev
 openssl-libs-static