diff options
| author | 2023-01-23 01:51:12 +0100 | |
|---|---|---|
| committer | 2023-01-23 06:23:00 +0100 | |
| commit | 34b1ea9c1925d0da9377973d25e10e9b5ec40e94 (patch) | |
| tree | 0ada6de7ae81a250258a4243d5bd4d2cc1283aef /src | |
| parent | Merge pull request #9555 from abouvier/catch2-update (diff) | |
| download | yuzu-34b1ea9c1925d0da9377973d25e10e9b5ec40e94.tar.gz yuzu-34b1ea9c1925d0da9377973d25e10e9b5ec40e94.tar.xz yuzu-34b1ea9c1925d0da9377973d25e10e9b5ec40e94.zip | |
cmake: prefer system llvm library
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/common/demangle.cpp | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index bd6ac6716..9884a4a0b 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt | |||
| @@ -177,7 +177,7 @@ endif() | |||
| 177 | create_target_directory_groups(common) | 177 | create_target_directory_groups(common) |
| 178 | 178 | ||
| 179 | target_link_libraries(common PUBLIC ${Boost_LIBRARIES} fmt::fmt microprofile Threads::Threads) | 179 | target_link_libraries(common PUBLIC ${Boost_LIBRARIES} fmt::fmt microprofile Threads::Threads) |
| 180 | target_link_libraries(common PRIVATE lz4::lz4 zstd::zstd demangle) | 180 | target_link_libraries(common PRIVATE lz4::lz4 zstd::zstd LLVM::Demangle) |
| 181 | 181 | ||
| 182 | if (YUZU_USE_PRECOMPILED_HEADERS) | 182 | if (YUZU_USE_PRECOMPILED_HEADERS) |
| 183 | target_precompile_headers(common PRIVATE precompiled_headers.h) | 183 | target_precompile_headers(common PRIVATE precompiled_headers.h) |
diff --git a/src/common/demangle.cpp b/src/common/demangle.cpp index f4246f666..3310faf86 100644 --- a/src/common/demangle.cpp +++ b/src/common/demangle.cpp | |||
| @@ -1,13 +1,11 @@ | |||
| 1 | // SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project | 1 | // SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project |
| 2 | // SPDX-License-Identifier: GPL-2.0-or-later | 2 | // SPDX-License-Identifier: GPL-2.0-or-later |
| 3 | 3 | ||
| 4 | #include <llvm/Demangle/Demangle.h> | ||
| 5 | |||
| 4 | #include "common/demangle.h" | 6 | #include "common/demangle.h" |
| 5 | #include "common/scope_exit.h" | 7 | #include "common/scope_exit.h" |
| 6 | 8 | ||
| 7 | namespace llvm { | ||
| 8 | char* itaniumDemangle(const char* mangled_name, char* buf, size_t* n, int* status); | ||
| 9 | } | ||
| 10 | |||
| 11 | namespace Common { | 9 | namespace Common { |
| 12 | 10 | ||
| 13 | std::string DemangleSymbol(const std::string& mangled) { | 11 | std::string DemangleSymbol(const std::string& mangled) { |