From bc30a591ba7252e0c16d9c1b3c75a7073735bcae Mon Sep 17 00:00:00 2001 From: James Rowe Date: Fri, 8 May 2020 15:09:29 -0600 Subject: 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 --- src/common/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/common/CMakeLists.txt') 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() create_target_directory_groups(common) -target_link_libraries(common PUBLIC Boost::boost fmt microprofile) -target_link_libraries(common PRIVATE lz4_static libzstd_static) +target_link_libraries(common PUBLIC Boost::boost fmt::fmt microprofile) +target_link_libraries(common PRIVATE lz4::lz4 zstd::zstd) -- cgit v1.2.3