diff options
| author | Alexandre Bouvier <contact@amb.tf> | 2023-01-23 01:51:12 +0100 |
|---|---|---|
| committer | Alexandre Bouvier <contact@amb.tf> | 2023-01-23 06:23:00 +0100 |
| commit | 34b1ea9c1925d0da9377973d25e10e9b5ec40e94 (patch) | |
| tree | 0ada6de7ae81a250258a4243d5bd4d2cc1283aef /externals | |
| parent | Merge pull request #9555 from abouvier/catch2-update (diff) | |
| download | yuzu-34b1ea9c1925d0da9377973d25e10e9b5ec40e94.tar yuzu-34b1ea9c1925d0da9377973d25e10e9b5ec40e94.tar.gz yuzu-34b1ea9c1925d0da9377973d25e10e9b5ec40e94.tar.bz2 yuzu-34b1ea9c1925d0da9377973d25e10e9b5ec40e94.tar.lz yuzu-34b1ea9c1925d0da9377973d25e10e9b5ec40e94.tar.xz yuzu-34b1ea9c1925d0da9377973d25e10e9b5ec40e94.tar.zst yuzu-34b1ea9c1925d0da9377973d25e10e9b5ec40e94.zip | |
Diffstat (limited to 'externals')
| -rw-r--r-- | externals/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | externals/demangle/ItaniumDemangle.cpp | 4 | ||||
| -rw-r--r-- | externals/demangle/llvm/Demangle/Demangle.h (renamed from externals/demangle/Demangle.h) | 0 | ||||
| -rw-r--r-- | externals/demangle/llvm/Demangle/DemangleConfig.h (renamed from externals/demangle/DemangleConfig.h) | 0 | ||||
| -rw-r--r-- | externals/demangle/llvm/Demangle/ItaniumDemangle.h (renamed from externals/demangle/ItaniumDemangle.h) | 0 | ||||
| -rw-r--r-- | externals/demangle/llvm/Demangle/StringView.h (renamed from externals/demangle/StringView.h) | 0 | ||||
| -rw-r--r-- | externals/demangle/llvm/Demangle/Utility.h (renamed from externals/demangle/Utility.h) | 0 |
7 files changed, 8 insertions, 5 deletions
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index 94dd8bb62..8532fd7a8 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -158,6 +158,9 @@ if (YUZU_USE_EXTERNAL_VULKAN_HEADERS) add_subdirectory(Vulkan-Headers EXCLUDE_FROM_ALL) endif() -add_library(demangle STATIC) -target_include_directories(demangle PUBLIC ./demangle) -target_sources(demangle PRIVATE demangle/ItaniumDemangle.cpp) +if (NOT TARGET LLVM::Demangle) + add_library(demangle STATIC) + target_include_directories(demangle PUBLIC ./demangle) + target_sources(demangle PRIVATE demangle/ItaniumDemangle.cpp) + add_library(LLVM::Demangle ALIAS demangle) +endif() diff --git a/externals/demangle/ItaniumDemangle.cpp b/externals/demangle/ItaniumDemangle.cpp index 5e078e3e2..b055a2fd7 100644 --- a/externals/demangle/ItaniumDemangle.cpp +++ b/externals/demangle/ItaniumDemangle.cpp @@ -11,8 +11,8 @@ // file does not yet support: // - C++ modules TS -#include "Demangle.h" -#include "ItaniumDemangle.h" +#include "llvm/Demangle/Demangle.h" +#include "llvm/Demangle/ItaniumDemangle.h" #include <cassert> #include <cctype> diff --git a/externals/demangle/Demangle.h b/externals/demangle/llvm/Demangle/Demangle.h index 5b673e4e1..5b673e4e1 100644 --- a/externals/demangle/Demangle.h +++ b/externals/demangle/llvm/Demangle/Demangle.h diff --git a/externals/demangle/DemangleConfig.h b/externals/demangle/llvm/Demangle/DemangleConfig.h index a8aef9df1..a8aef9df1 100644 --- a/externals/demangle/DemangleConfig.h +++ b/externals/demangle/llvm/Demangle/DemangleConfig.h diff --git a/externals/demangle/ItaniumDemangle.h b/externals/demangle/llvm/Demangle/ItaniumDemangle.h index 64b35c142..64b35c142 100644 --- a/externals/demangle/ItaniumDemangle.h +++ b/externals/demangle/llvm/Demangle/ItaniumDemangle.h diff --git a/externals/demangle/StringView.h b/externals/demangle/llvm/Demangle/StringView.h index 44d2b18a3..44d2b18a3 100644 --- a/externals/demangle/StringView.h +++ b/externals/demangle/llvm/Demangle/StringView.h diff --git a/externals/demangle/Utility.h b/externals/demangle/llvm/Demangle/Utility.h index 50d05c6b1..50d05c6b1 100644 --- a/externals/demangle/Utility.h +++ b/externals/demangle/llvm/Demangle/Utility.h |