diff options
| author | 2022-07-22 17:54:47 -0700 | |
|---|---|---|
| committer | 2022-07-22 17:54:47 -0700 | |
| commit | 58081a3664e3c069cd4efe5d96502c2fcc831535 (patch) | |
| tree | 06ba40b5701eff84160b6a85e8075b7b66b3a08f /src | |
| parent | Merge pull request #8598 from Link4565/recv-dontwait (diff) | |
| parent | gitmodules: Remove 'externals' from names of submodules (diff) | |
| download | yuzu-58081a3664e3c069cd4efe5d96502c2fcc831535.tar.gz yuzu-58081a3664e3c069cd4efe5d96502c2fcc831535.tar.xz yuzu-58081a3664e3c069cd4efe5d96502c2fcc831535.zip | |
Merge pull request #8624 from lat9nq/vcpkg
ci,CMake: Drop Conan support for vcpkg
Diffstat (limited to '')
| -rw-r--r-- | src/common/CMakeLists.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index 73bf626d4..566695fde 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt | |||
| @@ -182,8 +182,9 @@ create_target_directory_groups(common) | |||
| 182 | 182 | ||
| 183 | target_link_libraries(common PUBLIC ${Boost_LIBRARIES} fmt::fmt microprofile Threads::Threads) | 183 | target_link_libraries(common PUBLIC ${Boost_LIBRARIES} fmt::fmt microprofile Threads::Threads) |
| 184 | target_link_libraries(common PRIVATE lz4::lz4 xbyak) | 184 | target_link_libraries(common PRIVATE lz4::lz4 xbyak) |
| 185 | if (MSVC) | 185 | if (TARGET zstd::zstd) |
| 186 | target_link_libraries(common PRIVATE zstd::zstd) | 186 | target_link_libraries(common PRIVATE zstd::zstd) |
| 187 | else() | 187 | else() |
| 188 | target_link_libraries(common PRIVATE zstd) | 188 | target_link_libraries(common PRIVATE |
| 189 | $<IF:$<TARGET_EXISTS:zstd::libzstd_shared>,zstd::libzstd_shared,zstd::libzstd_static>) | ||
| 189 | endif() | 190 | endif() |