[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2013-g3efc388

[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  3efc38828749d34c1f2e3c87a031db3b85dece14 (commit)
       via  fe664b5d1d4c00021197adf504c5f8de81f7cf5a (commit)
      from  910ad89f3c556f8902e3206a620b9c867b6dcb39 (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=3efc38828749d34c1f2e3c87a031db3b85dece14
commit 3efc38828749d34c1f2e3c87a031db3b85dece14
Merge: 910ad89 fe664b5
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 7 15:05:40 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Feb 7 15:05:40 2013 -0500

    Merge topic 'CMAKE_CL_64-CXX' into next
    
    fe664b5 MSVC: Fix CMAKE_CL_64 in CXX-only projects (#13896)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fe664b5d1d4c00021197adf504c5f8de81f7cf5a
commit fe664b5d1d4c00021197adf504c5f8de81f7cf5a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 7 15:04:06 2013 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Feb 7 15:04:06 2013 -0500

    MSVC: Fix CMAKE_CL_64 in CXX-only projects (#13896)
    
    When CXX is enabled without C then MSVC_CXX_ARCHITECTURE_ID is set
    instead but not MSVC_C_ARCHITECTURE_ID.  Test both.

diff --git a/Modules/Platform/Windows-MSVC.cmake b/Modules/Platform/Windows-MSVC.cmake
index 3a38d8f..f9df6d8 100644
--- a/Modules/Platform/Windows-MSVC.cmake
+++ b/Modules/Platform/Windows-MSVC.cmake
@@ -107,7 +107,7 @@ if(NOT MSVC_VERSION)
   endif()
 endif()
 
-if(MSVC_C_ARCHITECTURE_ID MATCHES 64)
+if(MSVC_C_ARCHITECTURE_ID MATCHES 64 OR MSVC_CXX_ARCHITECTURE_ID MATCHES 64)
   set(CMAKE_CL_64 1)
 else()
   set(CMAKE_CL_64 0)

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

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


hooks/post-receive
-- 
CMake