diff options
| author | Brad King <brad.king@kitware.com> | 2020-01-21 17:55:36 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2020-01-21 17:55:36 (GMT) |
| commit | 99e1be5d434203930ff1a0f90ae294901657cf16 (patch) | |
| tree | 52220d4393d6f4e6cadb07f7df88242e728a9667 | |
| parent | a3f9a9ab5580ad35da1bae8bf613f00ef92d871e (diff) | |
| parent | 1421005835d482c670e0d7b8db5b2493b3eca2a3 (diff) | |
| download | CMake-99e1be5d434203930ff1a0f90ae294901657cf16.zip CMake-99e1be5d434203930ff1a0f90ae294901657cf16.tar.gz CMake-99e1be5d434203930ff1a0f90ae294901657cf16.tar.bz2 | |
Merge branch 'msvc-runtime-library-masm' into release-3.15
Merge-request: !4257
| -rw-r--r-- | Modules/CMakeASM_MASMInformation.cmake | 6 |
1 files changed, 6 insertions, 0 deletions
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 "<CMAKE_ASM${ASM_DIALECT}_COMPILER> <DEFINES> <INCLUDES> <FLAGS> /c /Fo <OBJECT> <SOURCE>") +# 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) |