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 2a558989f553964140f612fc6d7d0cc3dcae1a19 (commit) via 73da92702c6e26e859dabf55f2c9d74252021b1b (commit) from 7fd618ba818b0f9c30777971852482c4c8d8ee8a (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=2a558989f553964140f612fc6d7d0cc3dcae1a19 commit 2a558989f553964140f612fc6d7d0cc3dcae1a19 Merge: 7fd618b 73da927 Author: Brad King <brad.k...@kitware.com> AuthorDate: Tue Feb 24 09:32:42 2015 -0500 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Tue Feb 24 09:32:42 2015 -0500 Merge topic 'refine-MSVC-ARM-WinCE' into next 73da9270 MSVC: Compute architecture family for all target platforms http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=73da92702c6e26e859dabf55f2c9d74252021b1b commit 73da92702c6e26e859dabf55f2c9d74252021b1b Author: Brad King <brad.k...@kitware.com> AuthorDate: Tue Feb 24 09:27:49 2015 -0500 Commit: Brad King <brad.k...@kitware.com> CommitDate: Tue Feb 24 09:27:49 2015 -0500 MSVC: Compute architecture family for all target platforms diff --git a/Modules/Platform/Windows-MSVC.cmake b/Modules/Platform/Windows-MSVC.cmake index 2d8dac9..267de3c 100644 --- a/Modules/Platform/Windows-MSVC.cmake +++ b/Modules/Platform/Windows-MSVC.cmake @@ -131,14 +131,18 @@ endif() # default to Debug builds set(CMAKE_BUILD_TYPE_INIT Debug) +# Compute an architecture family from the architecture id. +foreach(lang C CXX) + set(_MSVC_${lang}_ARCHITECTURE_FAMILY "${MSVC_${lang}_ARCHITECTURE_ID}") + if(_MSVC_${lang}_ARCHITECTURE_FAMILY MATCHES "^ARM") + set(_MSVC_${lang}_ARCHITECTURE_FAMILY "ARM") + elseif(_MSVC_${lang}_ARCHITECTURE_FAMILY MATCHES "^SH") + set(_MSVC_${lang}_ARCHITECTURE_FAMILY "SHx") + endif() +endforeach() + if(WINCE) foreach(lang C CXX) - set(_MSVC_${lang}_ARCHITECTURE_FAMILY "${MSVC_${lang}_ARCHITECTURE_ID}") - if(_MSVC_${lang}_ARCHITECTURE_FAMILY MATCHES "^ARM") - 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() ----------------------------------------------------------------------- Summary of changes: Modules/Platform/Windows-MSVC.cmake | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits