diff options
| author | Brad King <brad.king@kitware.com> | 2013-06-14 13:00:48 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-06-14 13:00:48 (GMT) |
| commit | 2acbd419e2db4901c45f9ffe4d85752004371d5e (patch) | |
| tree | d9b02aefa61625f6d639ad9b41db8d1989562c03 /Modules/CMakeDetermineASMCompiler.cmake | |
| parent | ed2f59e6149ab763c20653365fb881a9b9e315fd (diff) | |
| parent | bc460ea2fc9223092da2fd65daefaf8eecc16cfb (diff) | |
| download | CMake-2acbd419e2db4901c45f9ffe4d85752004371d5e.zip CMake-2acbd419e2db4901c45f9ffe4d85752004371d5e.tar.gz CMake-2acbd419e2db4901c45f9ffe4d85752004371d5e.tar.bz2 | |
Merge topic 'FixAsmSupport'
bc460ea asm support: adapt to changes in CMakeDetectCompiler in 2.8.10
Diffstat (limited to 'Modules/CMakeDetermineASMCompiler.cmake')
| -rw-r--r-- | Modules/CMakeDetermineASMCompiler.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/CMakeDetermineASMCompiler.cmake b/Modules/CMakeDetermineASMCompiler.cmake index 3643b17..0fecb5d 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() |