From 1421005835d482c670e0d7b8db5b2493b3eca2a3 Mon Sep 17 00:00:00 2001 From: Brad King Date: Tue, 21 Jan 2020 12:48:29 -0500 Subject: ASM_MASM: Populate MSVC runtime library abstraction table In commit fb3370b6a1 (MSVC: Add abstraction for runtime library selection, 2019-04-10, v3.15.0-rc1~229^2) we overlooked populating the runtime library selection flags for the Microsoft assembler. It does not actually have any such flags, but since its compiler id is `MSVC` our generators expect the table to be populated. Use empty values. Without this fix, enabling the `ASM_MASM` language with policy `CMP0091` set to `NEW` causes an error due to the missing table entries. Fixes: #20236, #19453 --- Modules/CMakeASM_MASMInformation.cmake | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Modules/CMakeASM_MASMInformation.cmake b/Modules/CMakeASM_MASMInformation.cmake index a38c114..9f7e934 100644 --- a/Modules/CMakeASM_MASMInformation.cmake +++ b/Modules/CMakeASM_MASMInformation.cmake @@ -10,5 +10,11 @@ set(CMAKE_ASM${ASM_DIALECT}_SOURCE_FILE_EXTENSIONS asm) set(CMAKE_ASM${ASM_DIALECT}_COMPILE_OBJECT " /c /Fo ") +# The ASM_MASM compiler id for this compiler is "MSVC", so fill out the runtime library table. +set(CMAKE_ASM${ASM_DIALECT}_COMPILE_OPTIONS_MSVC_RUNTIME_LIBRARY_MultiThreaded "") +set(CMAKE_ASM${ASM_DIALECT}_COMPILE_OPTIONS_MSVC_RUNTIME_LIBRARY_MultiThreadedDLL "") +set(CMAKE_ASM${ASM_DIALECT}_COMPILE_OPTIONS_MSVC_RUNTIME_LIBRARY_MultiThreadedDebug "") +set(CMAKE_ASM${ASM_DIALECT}_COMPILE_OPTIONS_MSVC_RUNTIME_LIBRARY_MultiThreadedDebugDLL "") + include(CMakeASMInformation) set(ASM_DIALECT) -- cgit v0.12