This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 2604899aacd0bc9255d8cedf1f2a20b66574217f (commit)
via e4c046521f1da9cee44833d88320d7551719059b (commit)
via 619fa2cce851728790986108e6519e7f440387ee (commit)
from 894e00bded28af3e7ca3eb14c283d4e77253a9bd (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2604899aacd0bc9255d8cedf1f2a20b66574217f
commit 2604899aacd0bc9255d8cedf1f2a20b66574217f
Merge: 894e00b e4c0465
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed May 8 09:17:41 2013 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Wed May 8 09:17:41 2013 -0400
Merge topic 'vs-compiler-id-arm' into next
e4c0465 VS: Detect MSVC compiler id on ARM toolchain
619fa2c CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e4c046521f1da9cee44833d88320d7551719059b
commit e4c046521f1da9cee44833d88320d7551719059b
Author: Alexander Mohr <thehes...@hotmail.com>
AuthorDate: Wed May 8 09:10:52 2013 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Wed May 8 09:10:52 2013 -0400
VS: Detect MSVC compiler id on ARM toolchain
This enables detection with the VS2012 CTP for windows Blue (8.1).
To build native ARM you need to have the WOA SDK (Windows on ARM).
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)
-----------------------------------------------------------------------
Summary of changes:
Modules/CMakeDetermineCompilerId.cmake | 2 ++
Source/CMakeVersion.cmake | 2 +-
2 files changed, 3 insertions(+), 1 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
