diff options
| author | Alex Neundorf <neundorf@kde.org> | 2013-06-11 19:06:35 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2013-06-14 12:54:34 (GMT) |
| commit | bc460ea2fc9223092da2fd65daefaf8eecc16cfb (patch) | |
| tree | 1f5eff16b889997b7140a8d9a06d2a0a5f7c9426 /Modules/CMakeDetermineASMCompiler.cmake | |
| parent | 5dd8c01429da90a7417b72f17e784cc98f70f57c (diff) | |
| download | CMake-bc460ea2fc9223092da2fd65daefaf8eecc16cfb.zip CMake-bc460ea2fc9223092da2fd65daefaf8eecc16cfb.tar.gz CMake-bc460ea2fc9223092da2fd65daefaf8eecc16cfb.tar.bz2 | |
asm support: adapt to changes in CMakeDetectCompiler in 2.8.10
This fixes #14210. In 2.8.10 CMakeDetermineCompiler.cmake was
modified (or added), and now the _INIT variable must not
be set to a list anymore, before it worked.
Alex
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 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() |