diff options
| author | Brad King <brad.king@kitware.com> | 2021-08-25 13:17:59 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-08-25 13:18:11 (GMT) |
| commit | 67d0d8b9d56291c16b4364b8b5371d78c3b14262 (patch) | |
| tree | 09fc2cba6a728d89607bda74fb85845385341904 /Modules | |
| parent | e7fe4633b785af8ca34f5ca6a1e2b20406110206 (diff) | |
| parent | bf09145eb0cfc80068441631d0b106cc7948cff3 (diff) | |
| download | CMake-67d0d8b9d56291c16b4364b8b5371d78c3b14262.zip CMake-67d0d8b9d56291c16b4364b8b5371d78c3b14262.tar.gz CMake-67d0d8b9d56291c16b4364b8b5371d78c3b14262.tar.bz2 | |
Merge topic 'darwin-wmake-jwasm-support'
bf09145eb0 Enable Watcom WMake generator on Darwin
78f758a463 Use dashes for MASM flags
Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !6472
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CMakeASM_MASMInformation.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/CMakeASM_MASMInformation.cmake b/Modules/CMakeASM_MASMInformation.cmake index 6d1e174..656b75e 100644 --- a/Modules/CMakeASM_MASMInformation.cmake +++ b/Modules/CMakeASM_MASMInformation.cmake @@ -8,7 +8,7 @@ set(ASM_DIALECT "_MASM") 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>") +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 "") |