diff options
| -rw-r--r-- | external/CMakeLists.txt | 23 | ||||
| -rw-r--r-- | source/slang/slang-ir-use-uninitialized-values.cpp | 2 |
2 files changed, 12 insertions, 13 deletions
diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index 0280bbcd3..72a27285e 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -8,8 +8,13 @@ if(NOT CMAKE_MESSAGE_LOG_LEVEL) set(CMAKE_MESSAGE_LOG_LEVEL NOTICE) endif() +# Similarly, disable warnings for external projects +if(NOT SLANG_ENABLE_EXTERNAL_COMPILER_WARNINGS) + add_compile_options(-w) +endif() + # Miniz -add_subdirectory(miniz EXCLUDE_FROM_ALL) +add_subdirectory(miniz EXCLUDE_FROM_ALL SYSTEM) set_property(TARGET miniz PROPERTY POSITION_INDEPENDENT_CODE ON) # Work around https://github.com/richgel999/miniz/pull/292 get_target_property(miniz_c_launcher miniz C_COMPILER_LAUNCHER) @@ -20,23 +25,17 @@ endif() # LZ4 set(LZ4_BUNDLED_MODE ON) -add_subdirectory(lz4/build/cmake EXCLUDE_FROM_ALL) -if(MSVC) - target_compile_options( - lz4_static - PRIVATE /wd5045 /wd4820 /wd4711 /wd6385 /wd6262 - ) -endif() +add_subdirectory(lz4/build/cmake EXCLUDE_FROM_ALL SYSTEM) # Vulkan headers -add_subdirectory(vulkan EXCLUDE_FROM_ALL) +add_subdirectory(vulkan EXCLUDE_FROM_ALL SYSTEM) # metal-cpp headers add_library(metal-cpp INTERFACE) target_include_directories(metal-cpp INTERFACE "${CMAKE_CURRENT_LIST_DIR}/metal-cpp") # SPIRV-Headers -add_subdirectory(spirv-headers EXCLUDE_FROM_ALL) +add_subdirectory(spirv-headers EXCLUDE_FROM_ALL SYSTEM) if(SLANG_ENABLE_SLANG_GLSLANG) # SPIRV-Tools @@ -44,13 +43,13 @@ if(SLANG_ENABLE_SLANG_GLSLANG) set(SPIRV_WERROR OFF) set(SPIRV_HEADER_DIR "${CMAKE_CURRENT_LIST_DIR}/spirv-headers/") set(SPIRV_SKIP_TESTS ON) - add_subdirectory(spirv-tools EXCLUDE_FROM_ALL) + add_subdirectory(spirv-tools EXCLUDE_FROM_ALL SYSTEM) # glslang set(SKIP_GLSLANG_INSTALL ON) set(ENABLE_OPT ON) set(ENABLE_PCH OFF) - add_subdirectory(glslang EXCLUDE_FROM_ALL) + add_subdirectory(glslang EXCLUDE_FROM_ALL SYSTEM) endif() # imgui diff --git a/source/slang/slang-ir-use-uninitialized-values.cpp b/source/slang/slang-ir-use-uninitialized-values.cpp index 7015d7470..9780d669a 100644 --- a/source/slang/slang-ir-use-uninitialized-values.cpp +++ b/source/slang/slang-ir-use-uninitialized-values.cpp @@ -188,7 +188,7 @@ namespace Slang else if (auto rev = as<IRBackwardDifferentiate>(callee)) ftn = as<IRFunc>(rev->getBaseFn()); else if (auto wit = as<IRLookupWitnessMethod>(callee)) - ftype = as<IRFuncType>(callee->getFullType()); + ftype = as<IRFuncType>(wit->getFullType()); else ftn = as<IRFunc>(callee); |