build: use vcpkg for all depends, vcpkg action on ci to cache
This commit is contained in:
parent
7199e5f170
commit
bf4a762124
4 changed files with 11 additions and 3 deletions
6
.github/workflows/ci.yml
vendored
6
.github/workflows/ci.yml
vendored
|
|
@ -146,9 +146,6 @@ jobs:
|
|||
- name: Install Ninja
|
||||
uses: seanmiddleditch/gha-setup-ninja@master
|
||||
|
||||
- name: Install dependencies
|
||||
run: python ./scripts/install_deps.py --skip-vcpkg
|
||||
|
||||
- name: vcpkg build
|
||||
id: vcpkg
|
||||
uses: johnwason/vcpkg-action@v6
|
||||
|
|
@ -158,6 +155,9 @@ jobs:
|
|||
token: ${{ github.token }}
|
||||
github-binarycache: true
|
||||
|
||||
- name: setup env
|
||||
run: python ./scripts/setup_venv.py
|
||||
|
||||
- name: Configure
|
||||
run: |
|
||||
cmake ${{ steps.vcpkg.outputs.vcpkg-cmake-config }} `
|
||||
|
|
|
|||
|
|
@ -636,6 +636,8 @@ macro(configure_wintoast)
|
|||
add_definitions(-DHAVE_WINTOAST=1)
|
||||
include_directories(${WINTOAST_DIR}/include)
|
||||
else()
|
||||
find_package(unofficial-wintoast CONFIG REQUIRED)
|
||||
set(wintoast-lib unofficial::wintoast::wintoast)
|
||||
message(WARNING "Subproject 'WinToast' not found")
|
||||
endif()
|
||||
|
||||
|
|
|
|||
|
|
@ -100,6 +100,7 @@ if(UNIX)
|
|||
server
|
||||
${cli11_lib}
|
||||
${tomlPP_lib}
|
||||
${wintoast-lib}
|
||||
)
|
||||
|
||||
if(NOT APPLE)
|
||||
|
|
|
|||
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"dependencies": [
|
||||
"qttranslations",
|
||||
"qtsvg",
|
||||
"wintoast",
|
||||
"gtest",
|
||||
"pkgconf",
|
||||
{
|
||||
"name": "openssl",
|
||||
"features": [
|
||||
|
|
|
|||
Loading…
Reference in a new issue