From c531bbb17fd887eaf7073f7159db43477d557ae3 Mon Sep 17 00:00:00 2001 From: Jarret Shook Date: Thu, 11 Feb 2021 08:12:12 -0800 Subject: [PATCH] Fix build by applying patch from master (#28142) --- configurecompiler.cmake | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configurecompiler.cmake b/configurecompiler.cmake index d769e82f579a..9b3d3c5c3c0f 100644 --- a/configurecompiler.cmake +++ b/configurecompiler.cmake @@ -581,6 +581,9 @@ if (WIN32) add_compile_options(/ZH:SHA_256) # use SHA256 for generating hashes of compiler processed source files. add_compile_options(/source-charset:utf-8) # Force MSVC to compile source as UTF-8. + # 5105: Windows SDK headers use 'defined' operator in some macros + add_compile_options(/wd4291 /wd5105) + if (CLR_CMAKE_PLATFORM_ARCH_I386) add_compile_options(/Gz) endif (CLR_CMAKE_PLATFORM_ARCH_I386)