Skip to content
This repository has been archived by the owner on Oct 20, 2022. It is now read-only.

Commit

Permalink
Switch to vcpkg manifest mode
Browse files Browse the repository at this point in the history
  • Loading branch information
matusnovak committed Oct 19, 2022
1 parent 6fb6db1 commit d2d6faa
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 16 deletions.
17 changes: 2 additions & 15 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ jobs:
triplet: x64-windows
vcpkg_dir: 'C:\vcpkg'
suffix: 'windows-win64'
generator: 'Visual Studio 16 2019'
generator: 'Visual Studio 17 2022'
arch: '-A x64'
- name: 'Windows x86'
os: windows-latest
triplet: x86-windows
vcpkg_dir: 'C:\vcpkg'
suffix: 'windows-win32'
generator: 'Visual Studio 16 2019'
generator: 'Visual Studio 17 2022'
arch: '-A Win32'
- name: 'Linux x64'
os: ubuntu-latest
Expand Down Expand Up @@ -64,19 +64,6 @@ jobs:
./bootstrap-vcpkg.sh
fi
- name: Cache vcpkg
uses: actions/cache@v2
with:
path: '${{ matrix.vcpkg_dir }}/installed'
key: deps-${{ matrix.triplet }}-${{ hashFiles('vcpkg.txt') }}
restore-keys: |
deps-${{ matrix.triplet }}-
- name: Install vcpkg packages
shell: bash
run: |
vcpkg install --triplet ${{ matrix.triplet }} $(cat vcpkg.txt)
- name: Configure
shell: bash
run: |
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
build*/
cmake-*/
temp/
example/doxygen*/
install/
.vscode/
.idea/
vcpkg_installed/
.vs/
*.kdev4
*~
Expand Down
9 changes: 9 additions & 0 deletions vcpkg.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"name": "doxybook2",
"version-string": "1.5.0",
"builtin-baseline": "1085a57da0725c19e19586025438e8c16f34c890",
"dependencies": [ "catch2", "fmt", "dirent", "fmt", "nlohmann-json", "inja", "cxxopts", "spdlog" ],
"overrides": [
{ "name": "catch2", "version": "2.13.8" }
]
}
1 change: 0 additions & 1 deletion vcpkg.txt

This file was deleted.

0 comments on commit d2d6faa

Please sign in to comment.