mirror of
https://github.com/browsermt/bergamot-translator.git
synced 2024-09-11 05:35:33 +03:00
Update ssplit cpp, pcre2 source compile to fix broken builds (#258)
* Update ssplit cpp, pcre2 source compile to fix tests * Syncing with browsermt/ssplit-cpp * Removing accidental binary inclusion * Removing brt accidental update by git add -u * Fix windows workflow, vcpkg is broken use our cmake route * [ssplit-cpp] Try searching different library names for Windows
This commit is contained in:
parent
7693a1d007
commit
fa4efb483b
3
.github/workflows/windows.yml
vendored
3
.github/workflows/windows.yml
vendored
@ -39,7 +39,7 @@ jobs:
|
||||
- name: Prepare vcpkg
|
||||
uses: lukka/run-vcpkg@v7.4
|
||||
with:
|
||||
vcpkgArguments: protobuf pcre2
|
||||
vcpkgArguments: protobuf
|
||||
vcpkgGitCommitId: 8dddc6c899ce6fdbeab38b525a31e7f23cb2d5bb
|
||||
vcpkgDirectory: ${{ github.workspace }}/vcpkg/
|
||||
vcpkgTriplet: x64-windows-static
|
||||
@ -51,6 +51,7 @@ jobs:
|
||||
buildDirectory: ${{ github.workspace }}/build
|
||||
cmakeAppendedArgs: '-G Ninja
|
||||
-DCMAKE_BUILD_TYPE="Release"
|
||||
-DSSPLIT_USE_INTERNAL_PCRE2="ON"
|
||||
-DUSE_WASM_COMPATIBLE_SOURCE="OFF"
|
||||
-DUSE_STATIC_LIBS="TRUE"'
|
||||
cmakeListsOrSettingsJson: CMakeListsTxtAdvanced
|
||||
|
2
3rd_party/ssplit-cpp
vendored
2
3rd_party/ssplit-cpp
vendored
@ -1 +1 @@
|
||||
Subproject commit 72dbd9346b9f0eede4444922c4e3fcfdc0d16abb
|
||||
Subproject commit 36beacd1ee4d9d591346d8e0f7f7700c7a91eb9f
|
Loading…
Reference in New Issue
Block a user