diff options
| author | Brad King <brad.king@kitware.com> | 2019-04-02 18:17:38 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-04-02 18:17:57 (GMT) |
| commit | 81985b7c6c9a15ca7a59c54979d8371c783fb581 (patch) | |
| tree | 47898f8a8a4a9e9bc328fe6b4d6a62f0aaa5df38 /Modules | |
| parent | 56ae290284a7f6f7298bf7410a361aaecb7ebbe9 (diff) | |
| parent | 9e4de543d067586b0f74666f7b07717a3f3173e0 (diff) | |
| download | CMake-81985b7c6c9a15ca7a59c54979d8371c783fb581.zip CMake-81985b7c6c9a15ca7a59c54979d8371c783fb581.tar.gz CMake-81985b7c6c9a15ca7a59c54979d8371c783fb581.tar.bz2 | |
Merge topic 'nasm-fix'
9e4de543d0 Modules: Check nasm compile object variable
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3167
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CMakeASM_NASMInformation.cmake | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Modules/CMakeASM_NASMInformation.cmake b/Modules/CMakeASM_NASMInformation.cmake index 1e3c608..cb793e7 100644 --- a/Modules/CMakeASM_NASMInformation.cmake +++ b/Modules/CMakeASM_NASMInformation.cmake @@ -28,7 +28,9 @@ if(NOT CMAKE_ASM_NASM_OBJECT_FORMAT) endif() endif() -set(CMAKE_ASM_NASM_COMPILE_OBJECT "<CMAKE_ASM_NASM_COMPILER> <INCLUDES> <FLAGS> -f ${CMAKE_ASM_NASM_OBJECT_FORMAT} -o <OBJECT> <SOURCE>") +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>") +endif() # Load the generic ASMInformation file: set(ASM_DIALECT "_NASM") |