mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-05 21:31:08 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'nasm-fix'

Browse Source 
9e4de543d0 Modules: Check nasm compile object variable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3167
This commit is contained in:
Brad King
2019-04-02 18:17:38 +00:00
committed by Kitware Robot
parent 56ae290284 9e4de543d0
commit 81985b7c6c
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Modules/CMakeASM_NASMInformation.cmake
View File

@@ -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")