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 /.ci/templates | |
| 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 '.ci/templates')
| -rw-r--r-- | .ci/templates/build-msvc.yml | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/.ci/templates/build-msvc.yml b/.ci/templates/build-msvc.yml index cca3189fa..5d2e86179 100644 --- a/.ci/templates/build-msvc.yml +++ b/.ci/templates/build-msvc.yml | |||
| @@ -6,9 +6,7 @@ parameters: | |||
| 6 | steps: | 6 | steps: |
| 7 | - script: choco install vulkan-sdk | 7 | - script: choco install vulkan-sdk |
| 8 | displayName: 'Install vulkan-sdk' | 8 | displayName: 'Install vulkan-sdk' |
| 9 | - script: python -m pip install --upgrade pip conan | 9 | - script: refreshenv && mkdir build && cd build && cmake -G "Visual Studio 17 2022" -A x64 -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=${COMPAT} -DYUZU_TESTS=OFF -DUSE_DISCORD_PRESENCE=ON -DENABLE_QT_TRANSLATION=ON -DDISPLAY_VERSION=${{ parameters['version'] }} -DCMAKE_BUILD_TYPE=Release -DYUZU_TESTS=OFF -DYUZU_USE_BUNDLED_VCPKG=ON .. && cd .. |
| 10 | displayName: 'Install conan' | ||
| 11 | - script: refreshenv && mkdir build && cd build && cmake -G "Visual Studio 17 2022" -A x64 -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=${COMPAT} -DYUZU_TESTS=OFF -DUSE_DISCORD_PRESENCE=ON -DENABLE_QT_TRANSLATION=ON -DDISPLAY_VERSION=${{ parameters['version'] }} -DCMAKE_BUILD_TYPE=Release .. && cd .. | ||
| 12 | displayName: 'Configure CMake' | 10 | displayName: 'Configure CMake' |
| 13 | - task: MSBuild@1 | 11 | - task: MSBuild@1 |
| 14 | displayName: 'Build' | 12 | displayName: 'Build' |