[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2326-g17bfe72

[Rolf Eike Beer]

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  17bfe720a97c51ad1e6cc1268c5ef6e1b57a71e2 (commit)
       via  add8d22acc9417cb144a0b497f4f5ef330bfc680 (commit)
       via  e597ba29288db609d0c3c797848fa7649851b1ee (commit)
      from  20e424b3acdb0fea04e54720da33e3e5f6031816 (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=17bfe720a97c51ad1e6cc1268c5ef6e1b57a71e2
commit 17bfe720a97c51ad1e6cc1268c5ef6e1b57a71e2
Merge: 20e424b add8d22
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Mon Feb 25 10:16:34 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 25 10:16:34 2013 -0500

    Merge topic 'Win-HOST_SYSTEM_PROCESSOR' into next
    
    add8d22 properly detect processor architecture on Windows
    e597ba2 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=add8d22acc9417cb144a0b497f4f5ef330bfc680
commit add8d22acc9417cb144a0b497f4f5ef330bfc680
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Mon Feb 25 16:14:36 2013 +0100
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Mon Feb 25 16:14:36 2013 +0100

    properly detect processor architecture on Windows
    
    CMake is usually run as a 32 bit process even on 64 bit Windows, so the
    PROCESSOR_ARCHITECTURE environment variable would always return x86. This post
    gives a description on how to do it properly:
    
    http://blogs.msdn.com/b/david.wang/archive/2006/03/26/howto-detect-process-bitness.aspx

diff --git a/Modules/CMakeDetermineSystem.cmake b/Modules/CMakeDetermineSystem.cmake
index c7f9c32..20c1541 100644
--- a/Modules/CMakeDetermineSystem.cmake
+++ b/Modules/CMakeDetermineSystem.cmake
@@ -73,7 +73,11 @@ if(CMAKE_HOST_UNIX)
 else()
   if(CMAKE_HOST_WIN32)
     set (CMAKE_HOST_SYSTEM_NAME "Windows")
-    set (CMAKE_HOST_SYSTEM_PROCESSOR "$ENV{PROCESSOR_ARCHITECTURE}")
+    if (ENV{PROCESSOR_ARCHITEW6432})
+      set (CMAKE_HOST_SYSTEM_PROCESSOR "$ENV{PROCESSOR_ARCHITEW6432}")
+    else()
+      set (CMAKE_HOST_SYSTEM_PROCESSOR "$ENV{PROCESSOR_ARCHITECTURE}")
+    endif()
   endif()
 endif()
 

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

Summary of changes:
 Modules/CMakeDetermineSystem.cmake |    6 +++++-
 Source/CMakeVersion.cmake          |    2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake