diff options
| author |  John Galt | 2020-07-09 11:25:10 -0400 |
|---|---|---|
| committer |  RealJohnGalt | 2020-07-09 11:35:28 -0400 |
| commit | 95cd2e17ab346b9aec0e40383b4effde23652c47 (patch) | |
| tree | 78a4c4753c3189455cd0c34bf05a588fdac40c2f | |
| parent | Merge pull request #4219 from ogniK5377/audio-timing (diff) | |
| download | yuzu-95cd2e17ab346b9aec0e40383b4effde23652c47.tar.gz yuzu-95cd2e17ab346b9aec0e40383b4effde23652c47.tar.xz yuzu-95cd2e17ab346b9aec0e40383b4effde23652c47.zip | |
cmake: fix fmt linking when found
This is a new attempt at #4206 that shouldn't break windows builds.
If someone else could test on windows, it would be much appreciated.
Previously, the build bot passed but the actual builds failed.
| -rw-r--r-- | src/common/CMakeLists.txt | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index d120c8d3d..423bef0f5 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt | |||
| @@ -191,5 +191,9 @@ endif() | |||
| 191 | create_target_directory_groups(common) | 191 | create_target_directory_groups(common) |
| 192 | find_package(Boost 1.71 COMPONENTS context headers REQUIRED) | 192 | find_package(Boost 1.71 COMPONENTS context headers REQUIRED) |
| 193 | 193 | ||
| 194 | target_link_libraries(common PUBLIC ${Boost_LIBRARIES} fmt::fmt microprofile) | 194 | if (fmt_FOUND) |
| 195 | target_link_libraries(common PUBLIC ${Boost_LIBRARIES} fmt microprofile) | ||
| 196 | else() | ||
| 197 | target_link_libraries(common PUBLIC ${Boost_LIBRARIES} fmt::fmt microprofile) | ||
| 198 | endif() | ||
| 195 | target_link_libraries(common PRIVATE lz4::lz4 zstd::zstd xbyak) | 199 | target_link_libraries(common PRIVATE lz4::lz4 zstd::zstd xbyak) |