浏览代码

Add support for yasm, a nasm compatible assembler

Alex
Alex Neundorf 15 年之前
父节点
当前提交
e614e9b3d7
共有 2 个文件被更改,包括 3 次插入3 次删除
  1. 1 1
      Modules/CMakeASM_NASMInformation.cmake
  2. 2 2
      Modules/CMakeDetermineASM_NASMCompiler.cmake

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

+ 2 - 2
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