diff options
| author | David Cole <david.cole@kitware.com> | 2012-05-17 18:58:41 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-05-17 18:58:41 (GMT) |
| commit | 8f635d0268be899286669f1a8be5da6c97671470 (patch) | |
| tree | e4e67fab8d580c57a12ae3380eacc550190a56b4 /Modules | |
| parent | c47f90487413703a1306cc0a0f03c05b981c2c2a (diff) | |
| parent | 5af93bb9879b95364af792b59325c23698ecf55a (diff) | |
| download | CMake-8f635d0268be899286669f1a8be5da6c97671470.zip CMake-8f635d0268be899286669f1a8be5da6c97671470.tar.gz CMake-8f635d0268be899286669f1a8be5da6c97671470.tar.bz2 | |
Merge topic 'vs11-arm-generator'
5af93bb VS11: Fix ARM architecture hint typo (#13077)
0fa3d09 VS11: Add ARM architecture generator (#13077)
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CMakeGenericSystem.cmake | 2 | ||||
| -rw-r--r-- | Modules/CMakePlatformId.h.in | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/Modules/CMakeGenericSystem.cmake b/Modules/CMakeGenericSystem.cmake index ee8040e..127588f 100644 --- a/Modules/CMakeGenericSystem.cmake +++ b/Modules/CMakeGenericSystem.cmake @@ -77,6 +77,8 @@ function(GetDefaultWindowsPrefixBase var) # if("${CMAKE_GENERATOR}" MATCHES "(Win64|IA64)") set(arch_hint "x64") + elseif("${CMAKE_GENERATOR}" MATCHES "ARM") + set(arch_hint "ARM") elseif("${CMAKE_SIZEOF_VOID_P}" STREQUAL "8") set(arch_hint "x64") elseif("$ENV{LIB}" MATCHES "(amd64|ia64)") diff --git a/Modules/CMakePlatformId.h.in b/Modules/CMakePlatformId.h.in index b69bf63..6341dca 100644 --- a/Modules/CMakePlatformId.h.in +++ b/Modules/CMakePlatformId.h.in @@ -97,6 +97,9 @@ # elif defined(_M_IX86) # define ARCHITECTURE_ID "X86" +# elif defined(_M_ARM) +# define ARCHITECTURE_ID "ARM" + # else /* unknown architecture */ # define ARCHITECTURE_ID "" # endif |