Browse Source

Merge topic 'nasm-fix'

9e4de543d0 Modules: Check nasm compile object variable

Acked-by: Kitware Robot <[email protected]>
Merge-request: !3167
Brad King 6 years ago
parent
commit
81985b7c6c
1 changed files with 3 additions and 1 deletions
  1. 3 1
      Modules/CMakeASM_NASMInformation.cmake

+ 3 - 1
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")