diff options
| author |  James Rowe | 2020-05-08 15:09:29 -0600 |
|---|---|---|
| committer |  GitHub | 2020-05-08 17:09:29 -0400 |
| commit | bc30a591ba7252e0c16d9c1b3c75a7073735bcae (patch) | |
| tree | 2e88ab16d60c7df3e665bcf7c75c24683cb07189 /src/common | |
| 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 'src/common')
| -rw-r--r-- | src/common/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index 6ffc612e7..d1ec8ff08 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt | |||
| @@ -172,5 +172,5 @@ endif() | |||
| 172 | 172 | ||
| 173 | create_target_directory_groups(common) | 173 | create_target_directory_groups(common) |
| 174 | 174 | ||
| 175 | target_link_libraries(common PUBLIC Boost::boost fmt microprofile) | 175 | target_link_libraries(common PUBLIC Boost::boost fmt::fmt microprofile) |
| 176 | target_link_libraries(common PRIVATE lz4_static libzstd_static) | 176 | target_link_libraries(common PRIVATE lz4::lz4 zstd::zstd) |