diff options
| author | 2020-05-08 15:09:29 -0600 | |
|---|---|---|
| committer | 2020-05-08 17:09:29 -0400 | |
| commit | bc30a591ba7252e0c16d9c1b3c75a7073735bcae (patch) | |
| tree | 2e88ab16d60c7df3e665bcf7c75c24683cb07189 /src/core/CMakeLists.txt | |
| 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/core/CMakeLists.txt')
| -rw-r--r-- | src/core/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 8546d3602..47418006b 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt | |||
| @@ -606,11 +606,11 @@ endif() | |||
| 606 | create_target_directory_groups(core) | 606 | create_target_directory_groups(core) |
| 607 | 607 | ||
| 608 | target_link_libraries(core PUBLIC common PRIVATE audio_core video_core) | 608 | target_link_libraries(core PUBLIC common PRIVATE audio_core video_core) |
| 609 | target_link_libraries(core PUBLIC Boost::boost PRIVATE fmt json-headers mbedtls opus unicorn) | 609 | target_link_libraries(core PUBLIC Boost::boost PRIVATE fmt::fmt nlohmann_json::nlohmann_json mbedtls Opus::Opus unicorn) |
| 610 | 610 | ||
| 611 | if (YUZU_ENABLE_BOXCAT) | 611 | if (YUZU_ENABLE_BOXCAT) |
| 612 | target_compile_definitions(core PRIVATE -DYUZU_ENABLE_BOXCAT) | 612 | target_compile_definitions(core PRIVATE -DYUZU_ENABLE_BOXCAT) |
| 613 | target_link_libraries(core PRIVATE httplib json-headers zip) | 613 | target_link_libraries(core PRIVATE httplib nlohmann_json::nlohmann_json zip) |
| 614 | endif() | 614 | endif() |
| 615 | 615 | ||
| 616 | if (ENABLE_WEB_SERVICE) | 616 | if (ENABLE_WEB_SERVICE) |