diff options
| author |  lat9nq | 2022-07-22 14:49:43 -0400 |
|---|---|---|
| committer | lat9nq | 2022-07-22 20:54:00 -0400 |
| commit | 265d1d697935ec65e31d55fc424d96276d41a8c9 (patch) | |
| tree | 2bf3da2f89b9fa8e7b33bfd088920613a9982949 /.github/workflows | |
| parent | ci,CMake: Drop Conan support for vcpkg (diff) | |
| download | yuzu-265d1d697935ec65e31d55fc424d96276d41a8c9.tar.gz yuzu-265d1d697935ec65e31d55fc424d96276d41a8c9.tar.xz yuzu-265d1d697935ec65e31d55fc424d96276d41a8c9.zip | |
ci,CMake: Integrate vcpkg into CMakeLists
Uses manifest mode if the bundled vcpkg is used.
Diffstat (limited to '.github/workflows')
| -rw-r--r-- | .github/workflows/verify.yml | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml index c1886b9f3..88e3a9a72 100644 --- a/.github/workflows/verify.yml +++ b/.github/workflows/verify.yml | |||
| @@ -80,7 +80,6 @@ jobs: | |||
| 80 | shell: cmd | 80 | shell: cmd |
| 81 | run: | | 81 | run: | |
| 82 | choco install vulkan-sdk wget | 82 | choco install vulkan-sdk wget |
| 83 | python -m pip install --upgrade pip conan | ||
| 84 | call refreshenv | 83 | call refreshenv |
| 85 | wget https://github.com/mbitsnbites/buildcache/releases/download/v0.27.6/buildcache-windows.zip | 84 | wget https://github.com/mbitsnbites/buildcache/releases/download/v0.27.6/buildcache-windows.zip |
| 86 | 7z x buildcache-windows.zip | 85 | 7z x buildcache-windows.zip |
| @@ -100,7 +99,7 @@ jobs: | |||
| 100 | run: | | 99 | run: | |
| 101 | glslangValidator --version | 100 | glslangValidator --version |
| 102 | mkdir build | 101 | mkdir build |
| 103 | cmake . -B build -GNinja -DCMAKE_TOOLCHAIN_FILE="CMakeModules/MSVCCache.cmake" -DUSE_CCACHE=ON -DYUZU_USE_BUNDLED_QT=1 -DYUZU_USE_BUNDLED_SDL2=1 -DYUZU_USE_QT_WEB_ENGINE=ON -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON -DYUZU_ENABLE_COMPATIBILITY_REPORTING=ON -DUSE_DISCORD_PRESENCE=ON -DENABLE_QT_TRANSLATION=ON -DCMAKE_BUILD_TYPE=Release | 102 | cmake . -B build -GNinja -DCMAKE_TOOLCHAIN_FILE="CMakeModules/MSVCCache.cmake" -DUSE_CCACHE=ON -DYUZU_USE_BUNDLED_QT=1 -DYUZU_USE_BUNDLED_SDL2=1 -DYUZU_USE_QT_WEB_ENGINE=ON -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON -DYUZU_ENABLE_COMPATIBILITY_REPORTING=ON -DUSE_DISCORD_PRESENCE=ON -DENABLE_QT_TRANSLATION=ON -DCMAKE_BUILD_TYPE=Release -DYUZU_TESTS=OFF -DYUZU_USE_BUNDLED_VCPKG=ON |
| 104 | - name: Build | 103 | - name: Build |
| 105 | run: cmake --build build | 104 | run: cmake --build build |
| 106 | - name: Cache Summary | 105 | - name: Cache Summary |