diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c97d2e233..1a14bb6a9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 }} ` diff --git a/cmake/Libraries.cmake b/cmake/Libraries.cmake index d8e3ed129..1735a149b 100644 --- a/cmake/Libraries.cmake +++ b/cmake/Libraries.cmake @@ -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() diff --git a/src/lib/deskflow/CMakeLists.txt b/src/lib/deskflow/CMakeLists.txt index 1bf9c5705..887cf670a 100644 --- a/src/lib/deskflow/CMakeLists.txt +++ b/src/lib/deskflow/CMakeLists.txt @@ -100,6 +100,7 @@ if(UNIX) server ${cli11_lib} ${tomlPP_lib} + ${wintoast-lib} ) if(NOT APPLE) diff --git a/vcpkg.json b/vcpkg.json index 2ee62c3e1..c184d2470 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -1,5 +1,10 @@ { "dependencies": [ + "qttranslations", + "qtsvg", + "wintoast", + "gtest", + "pkgconf", { "name": "openssl", "features": [