Fix MacOS again

userver-framework · Jan 6, 2025 · 305e1f9 · 305e1f9
1 parent 749b7ba
commit 305e1f9
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/cmake/modules/Findlibzip.cmake b/cmake/modules/Findlibzip.cmake
@@ -12,7 +12,7 @@ _userver_module_find_include(
 )
 
 _userver_module_find_library(
-    NAMES bz2 libbz2
+    NAMES libbz2.a bz2 libbz2
     PATH_SUFFIXES lib
 )
 

diff --git a/cmake/modules/Findlibzstd.cmake b/cmake/modules/Findlibzstd.cmake
@@ -21,6 +21,6 @@ _userver_module_find_library(
 
 _userver_module_end()
 
-if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
+if(CMAKE_SYSTEM_NAME MATCHES "Darwin" AND NOT TARGET zstd)
   add_library(zstd ALIAS libzstd)
 endif()
diff --git a/universal/CMakeLists.txt b/universal/CMakeLists.txt
@@ -226,11 +226,6 @@ if (USERVER_SANITIZE AND NOT CMAKE_BUILD_TYPE MATCHES "^Rel")
   target_link_libraries(${PROJECT_NAME} PUBLIC userver-compiler-rt-parts)
 endif()
 
-find_package(ICU COMPONENTS uc i18n data REQUIRED)
-add_library(icuuc ALIAS ICU::uc)
-add_library(icui18n ALIAS ICU::i18n)
-add_library(icudata ALIAS ICU::data)
-
 target_link_libraries(${PROJECT_NAME}
   PUBLIC
     Threads::Threads
@@ -242,9 +237,6 @@ target_link_libraries(${PROJECT_NAME}
     Boost::regex
     OpenSSL::Crypto
     OpenSSL::SSL
-    ICU::uc
-    ICU::i18n
-    ICU::data
 )
 
 if (USERVER_CONAN)
@@ -280,6 +272,18 @@ else()
       libzstd
       CryptoPP
   )
+
+  find_package(ICU COMPONENTS uc i18n data REQUIRED)
+  if (CMAKE_SYSTEM_NAME MATCHES "Darwin")
+    set_target_properties(ICU::uc PROPERTIES IMPORTED_GLOBAL TRUE)
+    set_target_properties(ICU::i18n PROPERTIES IMPORTED_GLOBAL TRUE)
+    set_target_properties(ICU::data PROPERTIES IMPORTED_GLOBAL TRUE)
+  endif()
+  add_library(icuuc ALIAS ICU::uc)
+  add_library(icui18n ALIAS ICU::i18n)
+  add_library(icudata ALIAS ICU::data)
+
+  target_link_libraries(${PROJECT_NAME} PRIVATE ICU::uc ICU::i18n ICU::data)
 endif()
 
 if (CMAKE_SYSTEM_NAME MATCHES "Darwin")