diff options
| author | Brad King <brad.king@kitware.com> | 2024-03-11 14:10:04 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2024-03-11 14:10:55 (GMT) |
| commit | a22245a97f89ac28b0c554767ff4912342c3c5a5 (patch) | |
| tree | 55e9b9664a27b5e18feb66a711881876a924522a | |
| parent | 5c3512333c6afb9496a3fde0bf146fb1fa570f27 (diff) | |
| parent | c34ef6c92281d71313345763e876352affca5176 (diff) | |
| download | CMake-a22245a97f89ac28b0c554767ff4912342c3c5a5.zip CMake-a22245a97f89ac28b0c554767ff4912342c3c5a5.tar.gz CMake-a22245a97f89ac28b0c554767ff4912342c3c5a5.tar.bz2 | |
Merge topic 'marmasm-language' into release-3.29
c34ef6c922 ASM_MARMASM: Remove broken partial support for preprocessor defines
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9326
| -rw-r--r-- | Modules/CMakeASM_MARMASMInformation.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/CMakeASM_MARMASMInformation.cmake b/Modules/CMakeASM_MARMASMInformation.cmake index 2026c17..a47f7c2 100644 --- a/Modules/CMakeASM_MARMASMInformation.cmake +++ b/Modules/CMakeASM_MARMASMInformation.cmake @@ -8,7 +8,7 @@ set(ASM_DIALECT "_MARMASM") set(CMAKE_ASM${ASM_DIALECT}_SOURCE_FILE_EXTENSIONS asm) -set(CMAKE_ASM${ASM_DIALECT}_COMPILE_OBJECT "<CMAKE_ASM${ASM_DIALECT}_COMPILER> <DEFINES> <INCLUDES> <FLAGS> -o <OBJECT> <SOURCE>") +set(CMAKE_ASM${ASM_DIALECT}_COMPILE_OBJECT "<CMAKE_ASM${ASM_DIALECT}_COMPILER> <INCLUDES> <FLAGS> -o <OBJECT> <SOURCE>") # The ASM_MARMASM 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 "") |