summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar bunnei2022-07-22 17:54:47 -0700
committerGravatar GitHub2022-07-22 17:54:47 -0700
commit58081a3664e3c069cd4efe5d96502c2fcc831535 (patch)
tree06ba40b5701eff84160b6a85e8075b7b66b3a08f /src
parentMerge pull request #8598 from Link4565/recv-dontwait (diff)
parentgitmodules: Remove 'externals' from names of submodules (diff)
downloadyuzu-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.txt5
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
183target_link_libraries(common PUBLIC ${Boost_LIBRARIES} fmt::fmt microprofile Threads::Threads) 183target_link_libraries(common PUBLIC ${Boost_LIBRARIES} fmt::fmt microprofile Threads::Threads)
184target_link_libraries(common PRIVATE lz4::lz4 xbyak) 184target_link_libraries(common PRIVATE lz4::lz4 xbyak)
185if (MSVC) 185if (TARGET zstd::zstd)
186 target_link_libraries(common PRIVATE zstd::zstd) 186 target_link_libraries(common PRIVATE zstd::zstd)
187else() 187else()
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>)
189endif() 190endif()