VERY experimental Nintendo Switch 2 emulator
C++
cmake: prefer system renderdoc header
Alexandre Bouvier6c2231980fca
diff --git a/CMakeLists.txt b/CMakeLists.txtindex 3b0891adf7..2bef9d6ed2 100644--- a/CMakeLists.txt+++ b/CMakeLists.txt@@ -333,6 +333,7 @@ find_package(LLVM 17 MODULE COMPONENTS Demangle)find_package(lz4 REQUIRED)find_package(nlohmann_json 3.8 REQUIRED)find_package(Opus 1.3 MODULE)+find_package(RenderDoc MODULE)find_package(VulkanMemoryAllocator CONFIG)find_package(ZLIB 1.2 REQUIRED)find_package(zstd 1.5 REQUIRED)diff --git a/CMakeModules/FindRenderDoc.cmake b/CMakeModules/FindRenderDoc.cmakenew file mode 100644index 0000000000..2678b936bc--- /dev/null+++ b/CMakeModules/FindRenderDoc.cmake@@ -0,0 +1,19 @@+# SPDX-FileCopyrightText: 2023 Alexandre Bouvier <[email protected]>+#+# SPDX-License-Identifier: GPL-3.0-or-later++find_path(RenderDoc_INCLUDE_DIR renderdoc_app.h)++include(FindPackageHandleStandardArgs)+find_package_handle_standard_args(RenderDoc+ REQUIRED_VARS RenderDoc_INCLUDE_DIR+)++if (RenderDoc_FOUND AND NOT TARGET RenderDoc::API)+ add_library(RenderDoc::API INTERFACE IMPORTED)+ set_target_properties(RenderDoc::API PROPERTIES+ INTERFACE_INCLUDE_DIRECTORIES "${RenderDoc_INCLUDE_DIR}"+ )+endif()++mark_as_advanced(RenderDoc_INCLUDE_DIR)diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txtindex a4c2ffc107..9eebc7d654 100644--- a/externals/CMakeLists.txt+++ b/externals/CMakeLists.txt@@ -174,8 +174,11 @@ target_include_directories(stb PUBLIC ./stb)add_library(bc_decoder bc_decoder/bc_decoder.cpp)target_include_directories(bc_decoder PUBLIC ./bc_decoder)-add_library(renderdoc INTERFACE)-target_include_directories(renderdoc SYSTEM INTERFACE ./renderdoc)+if (NOT TARGET RenderDoc::API)+ add_library(renderdoc INTERFACE)+ target_include_directories(renderdoc SYSTEM INTERFACE ./renderdoc)+ add_library(RenderDoc::API ALIAS renderdoc)+endif()if (ANDROID)if (ARCHITECTURE_arm64)diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txtindex b2dc71d4cb..4e1f1f47a8 100644--- a/src/core/CMakeLists.txt+++ b/src/core/CMakeLists.txt@@ -890,7 +890,7 @@ endif()create_target_directory_groups(core)target_link_libraries(core PUBLIC common PRIVATE audio_core network video_core nx_tzdb)-target_link_libraries(core PUBLIC Boost::headers PRIVATE fmt::fmt nlohmann_json::nlohmann_json mbedtls renderdoc)+target_link_libraries(core PUBLIC Boost::headers PRIVATE fmt::fmt nlohmann_json::nlohmann_json mbedtls RenderDoc::API)if (MINGW)target_link_libraries(core PRIVATE ${MSWSOCK_LIBRARY})endif()