diff options
| author | Brad King <brad.king@kitware.com> | 2021-09-29 13:51:03 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-09-29 13:51:20 (GMT) |
| commit | 9b1fc61722baa559bec2a1afa5f31b4da98b8a3b (patch) | |
| tree | 030ddf47ff11d82ec49c06ff65f5083e0e7d1be1 | |
| parent | 700f76299c40ba2c17841b69e480d13055743a0c (diff) | |
| parent | 9b94f95bed62cfcef7061ce94052ff246a673a95 (diff) | |
| download | CMake-9b1fc61722baa559bec2a1afa5f31b4da98b8a3b.zip CMake-9b1fc61722baa559bec2a1afa5f31b4da98b8a3b.tar.gz CMake-9b1fc61722baa559bec2a1afa5f31b4da98b8a3b.tar.bz2 | |
Merge topic 'nasm-defines-fix'
9b94f95bed ASM_NASM: Pass preprocessor definitions to assembler
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6567
| -rw-r--r-- | Modules/CMakeASM_NASMInformation.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/CMakeASM_NASMInformation.cmake b/Modules/CMakeASM_NASMInformation.cmake index dad2750..a72575b 100644 --- a/Modules/CMakeASM_NASMInformation.cmake +++ b/Modules/CMakeASM_NASMInformation.cmake @@ -35,7 +35,7 @@ if(NOT CMAKE_ASM_NASM_OBJECT_FORMAT) endif() if(NOT CMAKE_ASM_NASM_COMPILE_OBJECT) - set(CMAKE_ASM_NASM_COMPILE_OBJECT "<CMAKE_ASM_NASM_COMPILER> <INCLUDES> <FLAGS> -f ${CMAKE_ASM_NASM_OBJECT_FORMAT} -o <OBJECT> <SOURCE>") + set(CMAKE_ASM_NASM_COMPILE_OBJECT "<CMAKE_ASM_NASM_COMPILER> <DEFINES> <INCLUDES> <FLAGS> -f ${CMAKE_ASM_NASM_OBJECT_FORMAT} -o <OBJECT> <SOURCE>") endif() if(CMAKE_ASM_NASM_COMPILER_ID STREQUAL "NASM") |