diff options
| author | Alex Neundorf <neundorf@kde.org> | 2010-10-21 20:51:46 +0200 |
|---|---|---|
| committer | Alex Neundorf <neundorf@kde.org> | 2010-10-21 20:51:46 +0200 |
| commit | e614e9b3d7387b5aa1611f5547744e84b3a0645f (patch) | |
| tree | 725f3dc658b81f39d42fb4f9eccfb2febd4abed7 | |
| parent | 79dd9becadd39b518a90bbe4c86cd17a57ab1d54 (diff) | |
| download | cmake-e614e9b3d7387b5aa1611f5547744e84b3a0645f.tar.gz | |
Add support for yasm, a nasm compatible assembler
Alex
| -rw-r--r-- | Modules/CMakeASM_NASMInformation.cmake | 2 | ||||
| -rw-r--r-- | Modules/CMakeDetermineASM_NASMCompiler.cmake | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Modules/CMakeASM_NASMInformation.cmake b/Modules/CMakeASM_NASMInformation.cmake index 4b533a7f8f..afe53b32b8 100644 --- a/Modules/CMakeASM_NASMInformation.cmake +++ b/Modules/CMakeASM_NASMInformation.cmake @@ -14,7 +14,7 @@ # support for the nasm assembler -set(CMAKE_ASM_NASM_SOURCE_FILE_EXTENSIONS nasm) +set(CMAKE_ASM_NASM_SOURCE_FILE_EXTENSIONS nasm asm) if(WIN32) if(CMAKE_C_SIZEOF_DATA_PTR EQUAL 8) diff --git a/Modules/CMakeDetermineASM_NASMCompiler.cmake b/Modules/CMakeDetermineASM_NASMCompiler.cmake index 18aa8138fa..d184c0a810 100644 --- a/Modules/CMakeDetermineASM_NASMCompiler.cmake +++ b/Modules/CMakeDetermineASM_NASMCompiler.cmake @@ -12,9 +12,9 @@ # (To distribute this file outside of CMake, substitute the full # License text for the above reference.) -# Find the nasm assembler +# Find the nasm assembler. yasm (http://www.tortall.net/projects/yasm/) is nasm compatible -SET(CMAKE_ASM_NASM_COMPILER_INIT nasm) +SET(CMAKE_ASM_NASM_COMPILER_INIT nasm yasm) IF(NOT CMAKE_ASM_NASM_COMPILER) FIND_PROGRAM(CMAKE_ASM_NASM_COMPILER nasm |