[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2404-g2a21835

Rolf Eike Beer eike at sf-mail.de
Wed Mar 6 12:05:33 EST 2013


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  2a21835ddf6878d001b36ebb6e3edcdee92af380 (commit)
       via  20681c9e0573fcc7f1a9870c54a4edd5fde14568 (commit)
      from  32c56747a95cb291064cd0f1ec392467651de19d (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=2a21835ddf6878d001b36ebb6e3edcdee92af380
commit 2a21835ddf6878d001b36ebb6e3edcdee92af380
Merge: 32c5674 20681c9
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Wed Mar 6 12:05:30 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Mar 6 12:05:30 2013 -0500

    Merge topic 'Win-HOST_SYSTEM_PROCESSOR' into next
    
    20681c9 fix Windows processor detection


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=20681c9e0573fcc7f1a9870c54a4edd5fde14568
commit 20681c9e0573fcc7f1a9870c54a4edd5fde14568
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Wed Mar 6 18:04:53 2013 +0100
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Wed Mar 6 18:04:53 2013 +0100

    fix Windows processor detection
    
    Thanks to Martin Koller for this.

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

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

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


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list