diff options
| author | Alex Neundorf <neundorf@kde.org> | 2010-11-12 19:27:18 (GMT) |
|---|---|---|
| committer | Alex Neundorf <neundorf@kde.org> | 2010-11-12 19:27:18 (GMT) |
| commit | e0b60166d4c8526db0cf2e8b1eae49ba8ed45ff6 (patch) | |
| tree | 9f142f6de8bdcb59d7d5ce75b1f9aad40516668d | |
| parent | d25c2eb0c0a942d60826e6263d96a2ba59b97b92 (diff) | |
| download | CMake-e0b60166d4c8526db0cf2e8b1eae49ba8ed45ff6.zip CMake-e0b60166d4c8526db0cf2e8b1eae49ba8ed45ff6.tar.gz CMake-e0b60166d4c8526db0cf2e8b1eae49ba8ed45ff6.tar.bz2 | |
Some more fixes for nasm support, from Etienne (#10069)
Alex
| -rw-r--r-- | Modules/CMakeASM_NASMInformation.cmake | 36 |
1 files changed, 19 insertions, 17 deletions
diff --git a/Modules/CMakeASM_NASMInformation.cmake b/Modules/CMakeASM_NASMInformation.cmake index 449d1d6..9da7d30 100644 --- a/Modules/CMakeASM_NASMInformation.cmake +++ b/Modules/CMakeASM_NASMInformation.cmake @@ -16,27 +16,29 @@ set(CMAKE_ASM_NASM_SOURCE_FILE_EXTENSIONS nasm asm) -if(WIN32) - if(CMAKE_C_SIZEOF_DATA_PTR EQUAL 8) - SET(CMAKE_ASM_NASM_OBJECT_FORMAT win64) +if(NOT CMAKE_ASM_NASM_OBJECT_FORMAT) + if(WIN32) + if(CMAKE_C_SIZEOF_DATA_PTR EQUAL 8) + SET(CMAKE_ASM_NASM_OBJECT_FORMAT win64) + else() + SET(CMAKE_ASM_NASM_OBJECT_FORMAT win32) + endif() + elseif(APPLE) + if(CMAKE_C_SIZEOF_DATA_PTR EQUAL 8) + SET(CMAKE_ASM_NASM_OBJECT_FORMAT macho64) + else() + SET(CMAKE_ASM_NASM_OBJECT_FORMAT macho) + endif() else() - SET(CMAKE_ASM_NASM_OBJECT_FORMAT win32) - endif() -elseif(APPLE) - if(CMAKE_C_SIZEOF_DATA_PTR EQUAL 8) - SET(CMAKE_ASM_NASM_OBJECT_FORMAT macho64) - else() - SET(CMAKE_ASM_NASM_OBJECT_FORMAT macho) - endif() -else() - if(CMAKE_C_SIZEOF_DATA_PTR EQUAL 8) - SET(CMAKE_ASM_NASM_OBJECT_FORMAT elf64) - else() - SET(CMAKE_ASM_NASM_OBJECT_FORMAT elf) + if(CMAKE_C_SIZEOF_DATA_PTR EQUAL 8) + SET(CMAKE_ASM_NASM_OBJECT_FORMAT elf64) + else() + SET(CMAKE_ASM_NASM_OBJECT_FORMAT elf) + 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: set(ASM_DIALECT "_NASM") |