kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Some more fixes for nasm support, from Etienne (#10069)

Browse Source 
Alex
This commit is contained in:
Alex Neundorf 2010-11-12 20:27:18 +01:00
parent d25c2eb0c0
commit e0b60166d4
1 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Modules/CMakeASM_NASMInformation.cmake
View File

@ -16,6 +16,7 @@
set(CMAKE_ASM_NASM_SOURCE_FILE_EXTENSIONS nasm asm) set(CMAKE_ASM_NASM_SOURCE_FILE_EXTENSIONS nasm asm)
if(NOT CMAKE_ASM_NASM_OBJECT_FORMAT)
if(WIN32) if(WIN32)
if(CMAKE_C_SIZEOF_DATA_PTR EQUAL 8) if(CMAKE_C_SIZEOF_DATA_PTR EQUAL 8)
SET(CMAKE_ASM_NASM_OBJECT_FORMAT win64) SET(CMAKE_ASM_NASM_OBJECT_FORMAT win64)
@ -35,8 +36,9 @@ else()
SET(CMAKE_ASM_NASM_OBJECT_FORMAT elf) SET(CMAKE_ASM_NASM_OBJECT_FORMAT elf)
endif() endif()
endif() endif()
endif()
set(CMAKE_ASM_NASM_COMPILE_OBJECT "<CMAKE_ASM_NASM_COMPILER> <CMAKE_ASM_NASM_FLAGS> -f ${CMAKE_ASM_NASM_OBJECT_FORMAT} -o <OBJECT> <SOURCE>") set(CMAKE_ASM_NASM_COMPILE_OBJECT "<CMAKE_ASM_NASM_COMPILER> <FLAGS> -f ${CMAKE_ASM_NASM_OBJECT_FORMAT} -o <OBJECT> <SOURCE>")
# Load the generic ASMInformation file: # Load the generic ASMInformation file:
set(ASM_DIALECT "_NASM") set(ASM_DIALECT "_NASM")