summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorMinmin Gong <minmin.gong@gmail.com>2012-05-09 08:08:00 (GMT)
committerBrad King <brad.king@kitware.com>2012-05-09 13:12:13 (GMT)
commit0fa3d093693642a2b6535b93ea99344397f79267 (patch)
tree097012fc1239c1e2000da07fe027ae9044a5c434 /Modules
parentc5a67a7fec2dde8caba8044de3699331a89db020 (diff)
downloadCMake-0fa3d093693642a2b6535b93ea99344397f79267.zip
CMake-0fa3d093693642a2b6535b93ea99344397f79267.tar.gz
CMake-0fa3d093693642a2b6535b93ea99344397f79267.tar.bz2
VS11: Add ARM architecture generator (#13077)
Diffstat (limited to 'Modules')
-rw-r--r--Modules/CMakeGenericSystem.cmake2
-rw-r--r--Modules/CMakePlatformId.h.in3
2 files changed, 5 insertions, 0 deletions
diff --git a/Modules/CMakeGenericSystem.cmake b/Modules/CMakeGenericSystem.cmake
index ee8040e..bc4096d 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")
+ elif("${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