diff options
| author | Brad King <brad.king@kitware.com> | 2013-05-16 18:38:12 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-05-16 18:38:12 (GMT) |
| commit | 19bd84b3cde8b2d5453d937064ff91373874888f (patch) | |
| tree | e8b97a75d38a42501fb49fce1bef87bd7f0323ee /Modules | |
| parent | 0dc0e7d88505be5ce77dc9762fe30d4218a720a5 (diff) | |
| parent | e4c046521f1da9cee44833d88320d7551719059b (diff) | |
| download | CMake-19bd84b3cde8b2d5453d937064ff91373874888f.zip CMake-19bd84b3cde8b2d5453d937064ff91373874888f.tar.gz CMake-19bd84b3cde8b2d5453d937064ff91373874888f.tar.bz2 | |
Merge topic 'vs-compiler-id-arm'
e4c0465 VS: Detect MSVC compiler id on ARM toolchain
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CMakeDetermineCompilerId.cmake | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Modules/CMakeDetermineCompilerId.cmake b/Modules/CMakeDetermineCompilerId.cmake index b918092..ae91a29 100644 --- a/Modules/CMakeDetermineCompilerId.cmake +++ b/Modules/CMakeDetermineCompilerId.cmake @@ -131,6 +131,8 @@ Id flags: ${testflags} elseif("${id_arch}" STREQUAL "Itanium") set(id_machine_10 MachineIA64) set(id_arch ia64) + elseif("${id_arch}" STREQUAL "ARM") + set(id_machine_10 MachineARM) else() set(id_machine_6 x86) set(id_machine_10 MachineX86) |