File tree Expand file tree Collapse file tree 2 files changed +3
-3
lines changed
Expand file tree Collapse file tree 2 files changed +3
-3
lines changed Original file line number Diff line number Diff line change @@ -92,15 +92,15 @@ jobs:
9292
9393 - name : install mac dependencies arm64
9494 if : ${{ (runner.os == 'macOS') && (matrix.arch == 'arm64') }}
95- # explicitly install icu4c@76 and boost@1.86 , not icu4c/boost to avoid unsupported combinations
95+ # explicitly install icu4c@76 and boost@1.87 , not icu4c/boost to avoid unsupported combinations
9696 # Note: when brew reinstall finds unsolved deps, it downloads and installs using the wrong arch(x86_64 instead of arm64)
9797 run : |
9898 set -e
9999 echo "MACOSX_DEPLOYMENT_TARGET=13.0" >> $GITHUB_ENV
100100 echo "_CMAKE_PREFIX_PATH=${{ github.workspace }}/arm64-homebrew" >> $GITHUB_ENV
101101 echo "CIBW_REPAIR_WHEEL_COMMAND_MACOS=DYLD_LIBRARY_PATH=${{ github.workspace }}/arm64-homebrew delocate-wheel --require-archs {delocate_archs} -w {dest_dir} -v {wheel}" >> $GITHUB_ENV
102102 mkdir arm64-homebrew && curl -L https://github.com/Homebrew/brew/tarball/master | tar xz --strip 1 -C arm64-homebrew
103- PACKAGES=( icu4c@76 xz lz4 zstd zlib snappy boost@1.86 )
103+ PACKAGES=( icu4c@76 xz lz4 zstd zlib snappy boost@1.87 )
104104 for PACKAGE in "${PACKAGES[@]}"
105105 do
106106 arm64-homebrew/bin/brew info $PACKAGE
Original file line number Diff line number Diff line change @@ -72,7 +72,7 @@ else ()
7272 message (FATAL_ERROR "Can not find Boost" )
7373endif ()
7474if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin" )
75- set (_KEYVI_LINK_LIBRARIES_STATIC "${_KEYVI_LINK_LIBRARIES_STATIC} boost_program_options boost_iostreams boost_filesystem boost_system boost_regex boost_thread-mt " )
75+ set (_KEYVI_LINK_LIBRARIES_STATIC "${_KEYVI_LINK_LIBRARIES_STATIC} boost_program_options boost_iostreams boost_filesystem boost_system boost_regex boost_thread" )
7676else ()
7777 set (_KEYVI_LINK_LIBRARIES_DYNAMIC "${_KEYVI_LINK_LIBRARIES_DYNAMIC} boost_program_options boost_iostreams boost_filesystem boost_system boost_regex boost_thread" )
7878endif ()
You can’t perform that action at this time.
0 commit comments