From baa6d47ed26460506ab32b1157e1eed9b16c3812 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Mon, 2 Nov 2020 09:22:43 -0800 Subject: [PATCH] Set the MSVC RuntimeLibrary properties for ASM_MASM since they aren't populated until CMake 3.16.4 due to a bug in CMake. --- eng/native/configurecompiler.cmake | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/eng/native/configurecompiler.cmake b/eng/native/configurecompiler.cmake index ed20edf3e8c50a..7adc24d6acb627 100644 --- a/eng/native/configurecompiler.cmake +++ b/eng/native/configurecompiler.cmake @@ -627,6 +627,10 @@ if (CLR_CMAKE_HOST_WIN32) set(CMAKE_ASM_COMPILE_OBJECT " -g -o ") else() enable_language(ASM_MASM) + set(CMAKE_ASM_MASM_COMPILE_OPTIONS_MSVC_RUNTIME_LIBRARY_MultiThreaded "") + set(CMAKE_ASM_MASM_COMPILE_OPTIONS_MSVC_RUNTIME_LIBRARY_MultiThreadedDLL "") + set(CMAKE_ASM_MASM_COMPILE_OPTIONS_MSVC_RUNTIME_LIBRARY_MultiThreadedDebug "") + set(CMAKE_ASM_MASM_COMPILE_OPTIONS_MSVC_RUNTIME_LIBRARY_MultiThreadedDebugDLL "") endif() # Ensure that MC is present