diff options
| author | 2023-09-16 18:59:53 +0200 | |
|---|---|---|
| committer | 2023-09-18 18:35:20 +0200 | |
| commit | f93f31f4ae6c8ab22182ae0fdf4eb613658e98f3 (patch) | |
| tree | 1b95e0d8de1c3c2bd6c9ac9ce07ce914b6bec15e | |
| parent | Merge pull request #11258 from Squall-Leonhart/Z16_Assert_Fix (diff) | |
| download | yuzu-f93f31f4ae6c8ab22182ae0fdf4eb613658e98f3.tar.gz yuzu-f93f31f4ae6c8ab22182ae0fdf4eb613658e98f3.tar.xz yuzu-f93f31f4ae6c8ab22182ae0fdf4eb613658e98f3.zip | |
cmake: prefer system renderdoc header
Diffstat (limited to '')
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | CMakeModules/FindRenderDoc.cmake | 19 | ||||
| -rw-r--r-- | externals/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | src/core/CMakeLists.txt | 2 |
4 files changed, 26 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 3b0891adf..2bef9d6ed 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
| @@ -333,6 +333,7 @@ find_package(LLVM 17 MODULE COMPONENTS Demangle) | |||
| 333 | find_package(lz4 REQUIRED) | 333 | find_package(lz4 REQUIRED) |
| 334 | find_package(nlohmann_json 3.8 REQUIRED) | 334 | find_package(nlohmann_json 3.8 REQUIRED) |
| 335 | find_package(Opus 1.3 MODULE) | 335 | find_package(Opus 1.3 MODULE) |
| 336 | find_package(RenderDoc MODULE) | ||
| 336 | find_package(VulkanMemoryAllocator CONFIG) | 337 | find_package(VulkanMemoryAllocator CONFIG) |
| 337 | find_package(ZLIB 1.2 REQUIRED) | 338 | find_package(ZLIB 1.2 REQUIRED) |
| 338 | find_package(zstd 1.5 REQUIRED) | 339 | find_package(zstd 1.5 REQUIRED) |
diff --git a/CMakeModules/FindRenderDoc.cmake b/CMakeModules/FindRenderDoc.cmake new file mode 100644 index 000000000..2678b936b --- /dev/null +++ b/CMakeModules/FindRenderDoc.cmake | |||
| @@ -0,0 +1,19 @@ | |||
| 1 | # SPDX-FileCopyrightText: 2023 Alexandre Bouvier <contact@amb.tf> | ||
| 2 | # | ||
| 3 | # SPDX-License-Identifier: GPL-3.0-or-later | ||
| 4 | |||
| 5 | find_path(RenderDoc_INCLUDE_DIR renderdoc_app.h) | ||
| 6 | |||
| 7 | include(FindPackageHandleStandardArgs) | ||
| 8 | find_package_handle_standard_args(RenderDoc | ||
| 9 | REQUIRED_VARS RenderDoc_INCLUDE_DIR | ||
| 10 | ) | ||
| 11 | |||
| 12 | if (RenderDoc_FOUND AND NOT TARGET RenderDoc::API) | ||
| 13 | add_library(RenderDoc::API INTERFACE IMPORTED) | ||
| 14 | set_target_properties(RenderDoc::API PROPERTIES | ||
| 15 | INTERFACE_INCLUDE_DIRECTORIES "${RenderDoc_INCLUDE_DIR}" | ||
| 16 | ) | ||
| 17 | endif() | ||
| 18 | |||
| 19 | mark_as_advanced(RenderDoc_INCLUDE_DIR) | ||
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index a4c2ffc10..9eebc7d65 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt | |||
| @@ -174,8 +174,11 @@ target_include_directories(stb PUBLIC ./stb) | |||
| 174 | add_library(bc_decoder bc_decoder/bc_decoder.cpp) | 174 | add_library(bc_decoder bc_decoder/bc_decoder.cpp) |
| 175 | target_include_directories(bc_decoder PUBLIC ./bc_decoder) | 175 | target_include_directories(bc_decoder PUBLIC ./bc_decoder) |
| 176 | 176 | ||
| 177 | add_library(renderdoc INTERFACE) | 177 | if (NOT TARGET RenderDoc::API) |
| 178 | target_include_directories(renderdoc SYSTEM INTERFACE ./renderdoc) | 178 | add_library(renderdoc INTERFACE) |
| 179 | target_include_directories(renderdoc SYSTEM INTERFACE ./renderdoc) | ||
| 180 | add_library(RenderDoc::API ALIAS renderdoc) | ||
| 181 | endif() | ||
| 179 | 182 | ||
| 180 | if (ANDROID) | 183 | if (ANDROID) |
| 181 | if (ARCHITECTURE_arm64) | 184 | if (ARCHITECTURE_arm64) |
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index b2dc71d4c..4e1f1f47a 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt | |||
| @@ -890,7 +890,7 @@ endif() | |||
| 890 | create_target_directory_groups(core) | 890 | create_target_directory_groups(core) |
| 891 | 891 | ||
| 892 | target_link_libraries(core PUBLIC common PRIVATE audio_core network video_core nx_tzdb) | 892 | target_link_libraries(core PUBLIC common PRIVATE audio_core network video_core nx_tzdb) |
| 893 | target_link_libraries(core PUBLIC Boost::headers PRIVATE fmt::fmt nlohmann_json::nlohmann_json mbedtls renderdoc) | 893 | target_link_libraries(core PUBLIC Boost::headers PRIVATE fmt::fmt nlohmann_json::nlohmann_json mbedtls RenderDoc::API) |
| 894 | if (MINGW) | 894 | if (MINGW) |
| 895 | target_link_libraries(core PRIVATE ${MSWSOCK_LIBRARY}) | 895 | target_link_libraries(core PRIVATE ${MSWSOCK_LIBRARY}) |
| 896 | endif() | 896 | endif() |