diff options
| author | 2020-05-08 15:09:29 -0600 | |
|---|---|---|
| committer | 2020-05-08 17:09:29 -0400 | |
| commit | bc30a591ba7252e0c16d9c1b3c75a7073735bcae (patch) | |
| tree | 2e88ab16d60c7df3e665bcf7c75c24683cb07189 /.ci/templates | |
| parent | Merge pull request #3885 from ReinUsesLisp/viewport-swizzles (diff) | |
| download | yuzu-bc30a591ba7252e0c16d9c1b3c75a7073735bcae.tar.gz yuzu-bc30a591ba7252e0c16d9c1b3c75a7073735bcae.tar.xz yuzu-bc30a591ba7252e0c16d9c1b3c75a7073735bcae.zip | |
Replace externals with Conan (#3735)
* Remove git submodules that will be loaded through conan
* Move custom Find modules to their own folder
* Use conan for downloading missing external dependencies
* CI: Change the yuzu source folder user to the user that the containers run on
* Attempt to remove dirty mingw build hack
* Install conan on the msvc build
* Only set release build type when using not using multi config generator
* Re-add qt bundled to workaround an issue with conan qt not downloading prebuilt binaries
* Add workaround for submodules that use legacy CMAKE variables
* Re-add USE_BUNDLED_QT on the msvc build bot
Diffstat (limited to '.ci/templates')
| -rw-r--r-- | .ci/templates/build-msvc.yml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/.ci/templates/build-msvc.yml b/.ci/templates/build-msvc.yml index adcecf0ec..d85a949aa 100644 --- a/.ci/templates/build-msvc.yml +++ b/.ci/templates/build-msvc.yml | |||
| @@ -4,7 +4,9 @@ parameters: | |||
| 4 | version: '' | 4 | version: '' |
| 5 | 5 | ||
| 6 | steps: | 6 | steps: |
| 7 | - script: mkdir build && cd build && cmake -G "Visual Studio 16 2019" -A x64 --config Release -DYUZU_USE_BUNDLED_QT=1 -DYUZU_USE_BUNDLED_SDL2=1 -DYUZU_USE_BUNDLED_UNICORN=1 -DYUZU_USE_QT_WEB_ENGINE=ON -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON -DYUZU_ENABLE_COMPATIBILITY_REPORTING=${COMPAT} -DUSE_DISCORD_PRESENCE=ON -DDISPLAY_VERSION=${{ parameters['version'] }} .. && cd .. | 7 | - script: python -m pip install --upgrade pip conan |
| 8 | displayName: 'Install conan' | ||
| 9 | - script: mkdir build && cd build && cmake -G "Visual Studio 16 2019" -A x64 --config Release -DYUZU_USE_BUNDLED_QT=1 -DYUZU_USE_BUNDLED_UNICORN=1 -DYUZU_USE_QT_WEB_ENGINE=ON -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON -DYUZU_ENABLE_COMPATIBILITY_REPORTING=${COMPAT} -DUSE_DISCORD_PRESENCE=ON -DDISPLAY_VERSION=${{ parameters['version'] }} .. && cd .. | ||
| 8 | displayName: 'Configure CMake' | 10 | displayName: 'Configure CMake' |
| 9 | - task: MSBuild@1 | 11 | - task: MSBuild@1 |
| 10 | displayName: 'Build' | 12 | displayName: 'Build' |