Merge pull request #6139 from Morph1984/cmake-fix-build
ci: Fix MSVC build with CMake 3.20.0
This commit is contained in:
		| @@ -8,7 +8,7 @@ steps: | |||||||
|   displayName: 'Install vulkan-sdk' |   displayName: 'Install vulkan-sdk' | ||||||
| - script: python -m pip install --upgrade pip conan | - script: python -m pip install --upgrade pip conan | ||||||
|   displayName: 'Install 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' |   displayName: 'Configure CMake' | ||||||
| - task: MSBuild@1 | - task: MSBuild@1 | ||||||
|   displayName: 'Build' |   displayName: 'Build' | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user