diff options
| author | Connor Davis <davisc@ainfosec.com> | 2019-03-30 03:57:28 (GMT) |
|---|---|---|
| committer | Connor Davis <davisc@ainfosec.com> | 2019-03-30 03:57:28 (GMT) |
| commit | 9e4de543d067586b0f74666f7b07717a3f3173e0 (patch) | |
| tree | f07dee031881b06754bcb82369847e83c0b6471e /Modules | |
| parent | 1177464dda0849644d78abb1802b46238fe3feb3 (diff) | |
| download | CMake-9e4de543d067586b0f74666f7b07717a3f3173e0.zip CMake-9e4de543d067586b0f74666f7b07717a3f3173e0.tar.gz CMake-9e4de543d067586b0f74666f7b07717a3f3173e0.tar.bz2 | |
Modules: Check nasm compile object variable
Check if the CMAKE_ASM_NASM_COMPILE_OBJECT variable is set
before modifying it. Only modify if not previously set.
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") |