[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4312-gb046d3c

[Patrick Gansterer]

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  b046d3cd1c5463996548aaaefd94fb46dd6ce727 (commit)
       via  0b15ffc73b05c7ca82bfa904ba73112353851298 (commit)
      from  9daafde700af8febd025814935fa7b0ab9c600f7 (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=b046d3cd1c5463996548aaaefd94fb46dd6ce727
commit b046d3cd1c5463996548aaaefd94fb46dd6ce727
Merge: 9daafde 0b15ffc
Author:     Patrick Gansterer <paroga at paroga.com>
AuthorDate: Tue Sep 24 23:26:08 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Sep 24 23:26:08 2013 -0400

    Merge topic 'wince-archfam' into next
    
    0b15ffc MSVC: Fix WinCE arch family preprocessor symbol (#14436)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0b15ffc73b05c7ca82bfa904ba73112353851298
commit 0b15ffc73b05c7ca82bfa904ba73112353851298
Author:     Patrick Gansterer <paroga at paroga.com>
AuthorDate: Wed Sep 25 05:20:22 2013 +0200
Commit:     Patrick Gansterer <paroga at paroga.com>
CommitDate: Wed Sep 25 05:20:22 2013 +0200

    MSVC: Fix WinCE arch family preprocessor symbol (#14436)
    
    In commit bd827f98 (Use COFF file header header for architecture
    detection, 2013-08-05) the MSVC_<lang>_ARCHITECTURE_ID value computed by
    CMakeDetermineCompilerId.cmake changed for WinCE architectures to be the
    exact architecture read from the PE header.  Fix platform preprocessor
    definitions in Modules/Platform/Windows-MSVC.cmake to correspond to the
    architecture family (ARM or SHx) instead of the specific architecture.

diff --git a/Modules/Platform/Windows-MSVC.cmake b/Modules/Platform/Windows-MSVC.cmake
index d9881f2..7036ba0 100644
--- a/Modules/Platform/Windows-MSVC.cmake
+++ b/Modules/Platform/Windows-MSVC.cmake
@@ -124,8 +124,15 @@ endif()
 set(CMAKE_BUILD_TYPE_INIT Debug)
 
 if(WINCE)
-  string(TOUPPER "${MSVC_C_ARCHITECTURE_ID}" _MSVC_C_ARCHITECTURE_ID_UPPER)
-  string(TOUPPER "${MSVC_CXX_ARCHITECTURE_ID}" _MSVC_CXX_ARCHITECTURE_ID_UPPER)
+  foreach(lang C CXX)
+    set(_MSVC_${lang}_ARCHITECTURE_FAMILY "${MSVC_${lang}_ARCHITECTURE_ID}")
+    if(_MSVC_${lang}_ARCHITECTURE_FAMILY STREQUAL "THUMB")
+      set(_MSVC_${lang}_ARCHITECTURE_FAMILY "ARM")
+    elseif(_MSVC_${lang}_ARCHITECTURE_FAMILY MATCHES "^SH")
+      set(_MSVC_${lang}_ARCHITECTURE_FAMILY "SHx")
+    endif()
+    string(TOUPPER "${_MSVC_${lang}_ARCHITECTURE_FAMILY}" _MSVC_${lang}_ARCHITECTURE_FAMILY_UPPER)
+  endforeach()
 
   if("${CMAKE_SYSTEM_VERSION}" MATCHES "^([0-9]+)\\.([0-9]+)")
     math(EXPR _CE_VERSION "${CMAKE_MATCH_1}*100 + ${CMAKE_MATCH_2}")
@@ -136,8 +143,8 @@ if(WINCE)
   endif()
 
   set(_PLATFORM_DEFINES "/D_WIN32_WCE=0x${_CE_VERSION} /DUNDER_CE")
-  set(_PLATFORM_DEFINES_C " /D${MSVC_C_ARCHITECTURE_ID} /D_${_MSVC_C_ARCHITECTURE_ID_UPPER}_")
-  set(_PLATFORM_DEFINES_CXX " /D${MSVC_CXX_ARCHITECTURE_ID} /D_${_MSVC_CXX_ARCHITECTURE_ID_UPPER}_")
+  set(_PLATFORM_DEFINES_C " /D${_MSVC_C_ARCHITECTURE_FAMILY} /D_${_MSVC_C_ARCHITECTURE_FAMILY_UPPER}_")
+  set(_PLATFORM_DEFINES_CXX " /D${_MSVC_CXX_ARCHITECTURE_FAMILY} /D_${_MSVC_CXX_ARCHITECTURE_FAMILY_UPPER}_")
 
   set(_RTC1 "")
   set(_FLAGS_CXX " /GR /EHsc")

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

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


hooks/post-receive
-- 
CMake