From be66cc88acebe87e175659df1afc2e4586ed8958 Mon Sep 17 00:00:00 2001 From: Jay Kwak <82421531+jkwak-work@users.noreply.github.com> Date: Thu, 18 Jul 2024 14:31:27 -0700 Subject: Enable warnings-as-error for CI (#4659) Enable warnings-as-error for CI Closes #4664. Uses glslang commit that fixed a compiler warning Fixes a recent warning from external/CMakelist.txt A new macro, `SLANG_MAYBE_UNUSED` is added for a future need. --- external/CMakeLists.txt | 6 ++++++ external/glslang | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'external') diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index 72a27285e..3ad07f10a 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -26,6 +26,12 @@ endif() # LZ4 set(LZ4_BUNDLED_MODE ON) add_subdirectory(lz4/build/cmake EXCLUDE_FROM_ALL SYSTEM) +if(MSVC) + target_compile_options( + lz4_static + PRIVATE /wd5045 /wd4820 /wd4711 /wd6385 /wd6262 + ) +endif() # Vulkan headers add_subdirectory(vulkan EXCLUDE_FROM_ALL SYSTEM) diff --git a/external/glslang b/external/glslang index 4c20dc0cb..d86ef8a6e 160000 --- a/external/glslang +++ b/external/glslang @@ -1 +1 @@ -Subproject commit 4c20dc0cbb3b20d2afb9ee8595a39508f1066623 +Subproject commit d86ef8a6e2b10508266ec8d63d64e866479d70d1 -- cgit v1.2.3