diff options
| author | Brad King <brad.king@kitware.com> | 2013-07-02 12:35:33 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2013-07-02 12:35:33 (GMT) |
| commit | d9ece45a36af9c0640ee4fe0d4a1519dcd8f874d (patch) | |
| tree | cf6641a7a69932d33218bb8c4bba73b435c0d109 | |
| parent | 5bcca28096e8075e5b0746c97205a7ab2093ad61 (diff) | |
| parent | bc460ea2fc9223092da2fd65daefaf8eecc16cfb (diff) | |
| download | CMake-d9ece45a36af9c0640ee4fe0d4a1519dcd8f874d.zip CMake-d9ece45a36af9c0640ee4fe0d4a1519dcd8f874d.tar.gz CMake-d9ece45a36af9c0640ee4fe0d4a1519dcd8f874d.tar.bz2 | |
Merge branch 'FixAsmSupport' into release
| -rw-r--r-- | Modules/CMakeDetermineASM-ATTCompiler.cmake | 2 | ||||
| -rw-r--r-- | Modules/CMakeDetermineASMCompiler.cmake | 4 | ||||
| -rw-r--r-- | Modules/CMakeDetermineASM_NASMCompiler.cmake | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/Modules/CMakeDetermineASM-ATTCompiler.cmake b/Modules/CMakeDetermineASM-ATTCompiler.cmake index cec09e9..03c5668 100644 --- a/Modules/CMakeDetermineASM-ATTCompiler.cmake +++ b/Modules/CMakeDetermineASM-ATTCompiler.cmake @@ -15,6 +15,6 @@ # determine the compiler to use for ASM using AT&T syntax, e.g. GNU as set(ASM_DIALECT "-ATT") -set(CMAKE_ASM${ASM_DIALECT}_COMPILER_INIT ${_CMAKE_TOOLCHAIN_PREFIX}gas ${_CMAKE_TOOLCHAIN_PREFIX}as) +set(CMAKE_ASM${ASM_DIALECT}_COMPILER_LIST ${_CMAKE_TOOLCHAIN_PREFIX}gas ${_CMAKE_TOOLCHAIN_PREFIX}as) include(CMakeDetermineASMCompiler) set(ASM_DIALECT) diff --git a/Modules/CMakeDetermineASMCompiler.cmake b/Modules/CMakeDetermineASMCompiler.cmake index 9999f62..99b04e3 100644 --- a/Modules/CMakeDetermineASMCompiler.cmake +++ b/Modules/CMakeDetermineASMCompiler.cmake @@ -39,8 +39,8 @@ if(NOT CMAKE_ASM${ASM_DIALECT}_COMPILER) endif() endif() else() # some specific assembler "dialect" - if(NOT CMAKE_ASM${ASM_DIALECT}_COMPILER_INIT) - message(FATAL_ERROR "CMAKE_ASM${ASM_DIALECT}_COMPILER_INIT must be preset !") + if(NOT CMAKE_ASM${ASM_DIALECT}_COMPILER_INIT AND NOT CMAKE_ASM${ASM_DIALECT}_COMPILER_LIST) + message(FATAL_ERROR "CMAKE_ASM${ASM_DIALECT}_COMPILER_INIT or CMAKE_ASM${ASM_DIALECT}_COMPILER_LIST must be preset !") endif() endif() diff --git a/Modules/CMakeDetermineASM_NASMCompiler.cmake b/Modules/CMakeDetermineASM_NASMCompiler.cmake index 50f71dd..5d783b1 100644 --- a/Modules/CMakeDetermineASM_NASMCompiler.cmake +++ b/Modules/CMakeDetermineASM_NASMCompiler.cmake @@ -14,7 +14,7 @@ # Find the nasm assembler. yasm (http://www.tortall.net/projects/yasm/) is nasm compatible -set(CMAKE_ASM_NASM_COMPILER_INIT nasm yasm) +set(CMAKE_ASM_NASM_COMPILER_LIST nasm yasm) if(NOT CMAKE_ASM_NASM_COMPILER) find_program(CMAKE_ASM_NASM_COMPILER nasm |