Merge pull request #195 from chewing/use-vcpkg

build: use vcpkg for dependencies
chewing · Sep 19, 2024 · e8af6b9 · e8af6b9
2 parents a6195fc + db1825f
commit e8af6b9
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -41,6 +41,13 @@ jobs:
       - name: Add msbuild to PATH
         uses: microsoft/setup-msbuild@v2
 
+      - name: Setup vcpkg
+        run: |
+          echo VCPKG_ROOT=$env:VCPKG_INSTALLATION_ROOT >> $env:GITHUB_ENV
+          echo CMAKE_TOOLCHAIN_FILE=$env:VCPKG_INSTALLATION_ROOT\scripts\buildsystems\vcpkg.cmake >> $env:GITHUB_ENV
+          & $env:VCPKG_INSTALLATION_ROOT\vcpkg install --triplet x86-windows-static sqlite3
+          & $env:VCPKG_INSTALLATION_ROOT\vcpkg install --triplet x64-windows-static sqlite3
+
       - name: Build
         run: scripts/build_installer.bat
 

diff --git a/libchewing b/libchewing
diff --git a/scripts/build_installer.bat b/scripts/build_installer.bat
@@ -1,6 +1,6 @@
-cmake -B build\x86 -A Win32 -DBUILD_TESTING=OFF
+cmake -B build\x86 -A Win32 -DBUILD_TESTING=OFF -DVCPKG_TARGET_TRIPLET=x86-windows-static
 cmake --build build\x86 --config Release
-cmake -B build\x64 -A x64 -DBUILD_TESTING=OFF
+cmake -B build\x64 -A x64 -DBUILD_TESTING=OFF -DVCPKG_TARGET_TRIPLET=x64-windows-static
 cmake --build build\x64 --config Release
 pushd tsfreg
 cargo build --release

diff --git a/scripts/build_installer_debug.bat b/scripts/build_installer_debug.bat
@@ -1,6 +1,6 @@
-cmake -B build\x86 -A Win32 -DBUILD_TESTING=OFF
+cmake -B build\x86 -A Win32 -DBUILD_TESTING=OFF -DVCPKG_TARGET_TRIPLET=x86-windows-static
 cmake --build build\x86 --config Debug
-cmake -B build\x64 -A x64 -DBUILD_TESTING=OFF
+cmake -B build\x64 -A x64 -DBUILD_TESTING=OFF -DVCPKG_TARGET_TRIPLET=x64-windows-static
 cmake --build build\x64 --config Debug
 pushd tsfreg
 cargo build --release
+9 −3		.github/workflows/ci.yml
+15 −32		CMakeLists.txt
+20 −27		Cargo.lock
+0 −3		Cargo.toml
+ −		capi/data/mini.dat