[Cmake-commits] CMake branch, next, updated. v2.8.8-2850-g25ba956

[Brad King]

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  25ba9565fa1a17a506e9e6fbe5635878fdc2ab1c (commit)
       via  5af93bb9879b95364af792b59325c23698ecf55a (commit)
      from  b1a88048d97af7f67ff245a07b81333d54607c51 (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=25ba9565fa1a17a506e9e6fbe5635878fdc2ab1c
commit 25ba9565fa1a17a506e9e6fbe5635878fdc2ab1c
Merge: b1a8804 5af93bb
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu May 10 07:10:55 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu May 10 07:10:55 2012 -0400

    Merge topic 'vs11-arm-generator' into next
    
    5af93bb VS11: Fix ARM architecture hint typo (#13077)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5af93bb9879b95364af792b59325c23698ecf55a
commit 5af93bb9879b95364af792b59325c23698ecf55a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu May 10 07:08:09 2012 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu May 10 07:08:09 2012 -0400

    VS11: Fix ARM architecture hint typo (#13077)

diff --git a/Modules/CMakeGenericSystem.cmake b/Modules/CMakeGenericSystem.cmake
index bc4096d..127588f 100644
--- a/Modules/CMakeGenericSystem.cmake
+++ b/Modules/CMakeGenericSystem.cmake
@@ -77,7 +77,7 @@ function(GetDefaultWindowsPrefixBase var)
   #
   if("${CMAKE_GENERATOR}" MATCHES "(Win64|IA64)")
     set(arch_hint "x64")
-  elif("${CMAKE_GENERATOR}" MATCHES "ARM")
+  elseif("${CMAKE_GENERATOR}" MATCHES "ARM")
     set(arch_hint "ARM")
   elseif("${CMAKE_SIZEOF_VOID_P}" STREQUAL "8")
     set(arch_hint "x64")

-----------------------------------------------------------------------

Summary of changes:
 Modules/CMakeGenericSystem.cmake |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake