diff options
| author | Morph <39850852+Morph1984@users.noreply.github.com> | 2021-04-04 07:54:38 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-04 07:54:38 -0400 |
| commit | 69b2dbdffd68d232d37a7c30a8ca01aee4f0b7c7 (patch) | |
| tree | d59079a9c908a8ca232c33d1e62438f7f6fa9e8e | |
| parent | c92a211e7cf5fe2f064a35b5256fef35d70cfb8f (diff) | |
| parent | 17ad323b3664629eb7e6f56497af37df5edd6ae7 (diff) | |
Merge pull request #6139 from Morph1984/cmake-fix-build
ci: Fix MSVC build with CMake 3.20.0
| -rw-r--r-- | .ci/templates/build-msvc.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.ci/templates/build-msvc.yml b/.ci/templates/build-msvc.yml index 7211795500..0973670185 100644 --- a/.ci/templates/build-msvc.yml +++ b/.ci/templates/build-msvc.yml @@ -8,7 +8,7 @@ steps: displayName: 'Install vulkan-sdk' - script: python -m pip install --upgrade pip conan displayName: 'Install conan' -- script: refreshenv && mkdir build && cd build && cmake -G "Visual Studio 16 2019" -A x64 --config Release -DYUZU_USE_BUNDLED_QT=1 -DYUZU_USE_QT_WEB_ENGINE=ON -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON -DYUZU_ENABLE_COMPATIBILITY_REPORTING=${COMPAT} -DUSE_DISCORD_PRESENCE=ON -DENABLE_QT_TRANSLATION=ON -DDISPLAY_VERSION=${{ parameters['version'] }} .. && cd .. +- script: refreshenv && mkdir build && cd build && cmake -G "Visual Studio 16 2019" -A x64 -DYUZU_USE_BUNDLED_QT=1 -DYUZU_USE_QT_WEB_ENGINE=ON -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON -DYUZU_ENABLE_COMPATIBILITY_REPORTING=${COMPAT} -DUSE_DISCORD_PRESENCE=ON -DENABLE_QT_TRANSLATION=ON -DDISPLAY_VERSION=${{ parameters['version'] }} .. && cmake --install . --config Release && cd .. displayName: 'Configure CMake' - task: MSBuild@1 displayName: 'Build' |