From cdd8c00159a7c22f2ea11e91ab9536b8f5406a9b Mon Sep 17 00:00:00 2001 From: "Admiral H. Curtiss" Date: Sun, 10 Jul 2022 00:57:37 +0200 Subject: [PATCH 1/2] Externals: Disable warnings-as-errors for spirv_cross. --- Externals/spirv_cross/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Externals/spirv_cross/CMakeLists.txt b/Externals/spirv_cross/CMakeLists.txt index 522f8b5073..1063ef65af 100644 --- a/Externals/spirv_cross/CMakeLists.txt +++ b/Externals/spirv_cross/CMakeLists.txt @@ -47,6 +47,7 @@ endif() endif() add_library(spirv_cross STATIC ${SRCS}) +dolphin_disable_warnings_msvc(spirv_cross) target_compile_definitions(spirv_cross PUBLIC SPIRV_CROSS_EXCEPTIONS_TO_ASSERTIONS) target_include_directories(spirv_cross PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/SPIRV-Cross/include ${CMAKE_CURRENT_SOURCE_DIR}/SPIRV-Cross) From cdd357149113db644d8c5fdeaa3832364b233b6a Mon Sep 17 00:00:00 2001 From: "Admiral H. Curtiss" Date: Sun, 10 Jul 2022 00:59:32 +0200 Subject: [PATCH 2/2] D3DCommon: Add glslang include directories in CMake. --- Source/Core/VideoBackends/D3DCommon/CMakeLists.txt | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Source/Core/VideoBackends/D3DCommon/CMakeLists.txt b/Source/Core/VideoBackends/D3DCommon/CMakeLists.txt index 90464c72e7..3baca1a44d 100644 --- a/Source/Core/VideoBackends/D3DCommon/CMakeLists.txt +++ b/Source/Core/VideoBackends/D3DCommon/CMakeLists.txt @@ -14,6 +14,15 @@ PUBLIC spirv_cross ) +target_include_directories(videod3dcommon +SYSTEM PUBLIC + ${CMAKE_SOURCE_DIR}/Externals/glslang/glslang/Public +SYSTEM PRIVATE + ${CMAKE_SOURCE_DIR}/Externals/glslang/StandAlone + ${CMAKE_SOURCE_DIR}/Externals/glslang/SPIRV + ${CMAKE_SOURCE_DIR}/Externals/glslang +) + if(MSVC) # Add precompiled header target_link_libraries(videod3dcommon PRIVATE use_pch)