diff options
| author | Brad King <brad.king@kitware.com> | 2017-02-07 14:59:47 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2017-02-07 14:59:47 (GMT) |
| commit | 9bd017d20ec4a2f9f4ceb2a39aa764b584026026 (patch) | |
| tree | 5302b20b220c375423d2a0ae04a830ae87fa0923 /Modules/CMakeDetermineASMCompiler.cmake | |
| parent | 6dec5d5fb83a02f534d681d39c9caba87f3cf9c7 (diff) | |
| parent | 72ed051b12d983d298b9447d3464a38f5e0f918c (diff) | |
| download | CMake-9bd017d20ec4a2f9f4ceb2a39aa764b584026026.zip CMake-9bd017d20ec4a2f9f4ceb2a39aa764b584026026.tar.gz CMake-9bd017d20ec4a2f9f4ceb2a39aa764b584026026.tar.bz2 | |
Merge topic 'determine_id_without_user_specified_flags'
72ed051b CMakeDetermineCompilerId: check with and without user-specified flags
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 4162726..3f18a8c 100644 --- a/Modules/CMakeDetermineASMCompiler.cmake +++ b/Modules/CMakeDetermineASMCompiler.cmake @@ -93,8 +93,8 @@ if(NOT CMAKE_ASM${ASM_DIALECT}_COMPILER_ID) set(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDOR_REGEX_ARMCC "(ARM Compiler)|(ARM Assembler)") include(CMakeDetermineCompilerId) - CMAKE_DETERMINE_COMPILER_ID_VENDOR(ASM${ASM_DIALECT}) - + set(userflags) + CMAKE_DETERMINE_COMPILER_ID_VENDOR(ASM${ASM_DIALECT} "${userflags}") endif() if(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID) |