summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar lat9nq2020-12-12 22:20:24 -0500
committerGravatar lat9nq2020-12-13 01:28:51 -0500
commit292dd642cefb3717363e96974f055da9dc1cbf23 (patch)
tree886e3c6f8f7686761198ae3729c3a2f9238532e5 /src
parentcommon: Update CMakeList to fix build issue with Boost. (diff)
downloadyuzu-292dd642cefb3717363e96974f055da9dc1cbf23.tar.gz
yuzu-292dd642cefb3717363e96974f055da9dc1cbf23.tar.xz
yuzu-292dd642cefb3717363e96974f055da9dc1cbf23.zip
cmake: Fix generating CMake configs and linking with Boost
Fixes regression by 761206cf81b271f7f4dd6a167a120325b760dbf3, causing yuzu to not build on Linux with any version of Boost except a cached 1.73 Conan version from before about a day ago. Moves the Boost requirement out of the `REQUIRED_LIBS` psuedo-2D-array for Conan to instead be manually configured, using Conan as a fallback solution if the system does not meet our requirements. Requires any update from the linux-fresh container in order to build. **DO NOT MERGE** until someone with the MSVC toolchain can verify this works there, too.
Diffstat (limited to 'src')
-rw-r--r--src/common/CMakeLists.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index 0981fe90b..0acf70a0a 100644
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -210,7 +210,7 @@ endif()
210 210
211create_target_directory_groups(common) 211create_target_directory_groups(common)
212 212
213target_link_libraries(common PUBLIC Boost::boost fmt::fmt microprofile) 213target_link_libraries(common PUBLIC ${Boost_LIBRARIES} fmt::fmt microprofile)
214target_link_libraries(common PRIVATE lz4::lz4 xbyak) 214target_link_libraries(common PRIVATE lz4::lz4 xbyak)
215if (MSVC) 215if (MSVC)
216 target_link_libraries(common PRIVATE zstd::zstd) 216 target_link_libraries(common PRIVATE zstd::zstd)