1

.github/workflows/Release-all.yml

@@ -39,11 +39,11 @@ jobs:
             libogg \
             libvorbis \
             libzim  \
+            icu4c \
             lzip \
             ninja \
             opencc \
-            xapian
+            xapian 
-          brew install icu4c --force
       - name: Install eb
         run: |
           git clone https://github.com/xiaoyifang/eb.git

cmake/Deps_Unix.cmake

@@ -79,15 +79,13 @@ endif ()
 if (WITH_ZIM)
     if (APPLE)
 
-        # 执行 brew list 命令并捕获输出
+        if (EXISTS /opt/homebrew)
-        execute_process(
+            set(ENV{PKG_CONFIG_PATH} "/opt/homebrew/lib/pkgconfig:$ENV{PKG_CONFIG_PATH}")
-            COMMAND brew --prefix libzim
+        endif()
-            OUTPUT_VARIABLE LIBZIM_PATH
+
-            
+        if (EXISTS /usr/local)
-        )
+            set(ENV{PKG_CONFIG_PATH} "/usr/local/lib/pkgconfig:$ENV{PKG_CONFIG_PATH}")
-        message(STATUS "zim path:${LIBZIM_PATH}")
+        endif()
-        # ICU from homebrew is "key-only", we need to manually prioritize it -> see `brew info icu4c`
-        set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:${LIBZIM_PATH}/lib/pkgconfig")
     endif ()
     pkg_check_modules(ZIM REQUIRED IMPORTED_TARGET libzim)
     target_link_libraries(${GOLDENDICT} PRIVATE PkgConfig::ZIM)