[Cmake-commits] CMake branch, next, updated. v2.8.6-1567-gf872eb8

[Alexander Neundorf]

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  f872eb8c94dc50787192e0e23d570ee494788ae8 (commit)
       via  cf93d63c0ac5d2a5da21dd78812938dace4067e0 (commit)
      from  f48a0be07ebcdbe5d6c6a10d34e70cce164d9a9b (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=f872eb8c94dc50787192e0e23d570ee494788ae8
commit f872eb8c94dc50787192e0e23d570ee494788ae8
Merge: f48a0be cf93d63
Author:     Alexander Neundorf <neundorf at kde.org>
AuthorDate: Wed Oct 12 16:15:29 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 12 16:15:29 2011 -0400

    Merge topic 'DetectMasmCompilerId' into next
    
    cf93d63 fix #12465: detect the masm compiler ID ("MSVC")


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cf93d63c0ac5d2a5da21dd78812938dace4067e0
commit cf93d63c0ac5d2a5da21dd78812938dace4067e0
Author:     Alex Neundorf <neundorf at kde.org>
AuthorDate: Thu Oct 6 17:57:32 2011 +0200
Commit:     Alex Neundorf <neundorf at kde.org>
CommitDate: Thu Oct 6 17:57:32 2011 +0200

    fix #12465: detect the masm compiler ID ("MSVC")
    
    Alex

diff --git a/Modules/CMakeDetermineASMCompiler.cmake b/Modules/CMakeDetermineASMCompiler.cmake
index 171e31f..0a70d0a 100644
--- a/Modules/CMakeDetermineASMCompiler.cmake
+++ b/Modules/CMakeDetermineASMCompiler.cmake
@@ -107,6 +107,10 @@ IF(NOT CMAKE_ASM${ASM_DIALECT}_COMPILER_ID)
   SET(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDOR_FLAGS_XL "-qversion")
   SET(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDOR_REGEX_XL "XL C")
 
+  LIST(APPEND CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDORS MSVC )
+  SET(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDOR_FLAGS_MSVC "/?")
+  SET(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDOR_REGEX_MSVC "Microsoft")
+
   LIST(APPEND CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDORS TI_DSP )
   SET(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDOR_FLAGS_TI_DSP "-h")
   SET(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDOR_REGEX_TI_DSP "Texas Instruments")

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

Summary of changes:
 Modules/CMakeDetermineASMCompiler.cmake |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake