Skip to content

Commit

Permalink
Fix windows vcpkg behavior
Browse files Browse the repository at this point in the history
  • Loading branch information
rzblue committed Oct 23, 2023
1 parent f4cbcbc commit 609d39c
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 8 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/cmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,6 @@ jobs:
- name: Install CMake
uses: lukka/[email protected]

- name: Run vcpkg
uses: lukka/[email protected]
with:
vcpkgDirectory: ${{ runner.workspace }}/vcpkg
vcpkgGitCommitId: 78b61582c9e093fda56a01ebb654be15a0033897 # HEAD on 2023-08-6

- name: Run sccache-cache
uses: mozilla-actions/[email protected]

Expand All @@ -90,6 +84,12 @@ jobs:

- uses: actions/checkout@v3

- name: Run vcpkg
uses: lukka/[email protected]
with:
vcpkgDirectory: ${{ runner.workspace }}/vcpkg
vcpkgGitCommitId: 78b61582c9e093fda56a01ebb654be15a0033897 # HEAD on 2023-08-6

- name: configure
run: cmake -S . -B build -G "Ninja" -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DCMAKE_BUILD_TYPE=Release -DWITH_JAVA=OFF -DWITH_EXAMPLES=ON -DUSE_SYSTEM_FMTLIB=ON -DUSE_SYSTEM_LIBUV=ON -DUSE_SYSTEM_EIGEN=ON -DCMAKE_TOOLCHAIN_FILE=${{ runner.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_INSTALL_OPTIONS=--clean-after-build -DVCPKG_TARGET_TRIPLET=x64-windows-release -DVCPKG_HOST_TRIPLET=x64-windows-release
env:
Expand Down
6 changes: 4 additions & 2 deletions vcpkg.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
"opencv",
"eigen3",
"fmt",
"libuv"
]
"libuv",
"protobuf"
],
"builtin-baseline": "78b61582c9e093fda56a01ebb654be15a0033897"
}

0 comments on commit 609d39c

Please sign in to comment.