[Cmake-commits] CMake branch, next, updated. v2.8.4-1057-gdeb32dc

[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  deb32dc44be2d3f918aad43c9189e8d87f9bba75 (commit)
       via  4258b241349153c9154f70bd4bb2f6ba8bfc9af6 (commit)
      from  cab7ad3862ab9bad130b8421d87b78a1bb23fba7 (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=deb32dc44be2d3f918aad43c9189e8d87f9bba75
commit deb32dc44be2d3f918aad43c9189e8d87f9bba75
Merge: cab7ad3 4258b24
Author:     Alexander Neundorf <neundorf at kde.org>
AuthorDate: Tue Mar 1 17:01:35 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Mar 1 17:01:35 2011 -0500

    Merge topic 'ReworkedAsmSupport' into next
    
    4258b24 Add more regex for gcc, always print the ASM compiler ID


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4258b241349153c9154f70bd4bb2f6ba8bfc9af6
commit 4258b241349153c9154f70bd4bb2f6ba8bfc9af6
Author:     Alex Neundorf <neundorf at kde.org>
AuthorDate: Tue Mar 1 22:58:26 2011 +0100
Commit:     Alex Neundorf <neundorf at kde.org>
CommitDate: Tue Mar 1 22:58:26 2011 +0100

    Add more regex for gcc, always print the ASM compiler ID
    
    Now gcc is also recognized via "Free Software Foundation"
    
    Alex

diff --git a/Modules/CMakeDetermineASMCompiler.cmake b/Modules/CMakeDetermineASMCompiler.cmake
index ceab6aa..171e31f 100644
--- a/Modules/CMakeDetermineASMCompiler.cmake
+++ b/Modules/CMakeDetermineASMCompiler.cmake
@@ -89,7 +89,7 @@ IF(NOT CMAKE_ASM${ASM_DIALECT}_COMPILER_ID)
   # Table of per-vendor compiler id flags with expected output.
   LIST(APPEND CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDORS GNU )
   SET(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDOR_FLAGS_GNU "--version")
-  SET(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDOR_REGEX_GNU "(GNU assembler)|(GCC)")
+  SET(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDOR_REGEX_GNU "(GNU assembler)|(GCC)|(Free Software Foundation)")
 
   LIST(APPEND CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDORS HP )
   SET(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDOR_FLAGS_HP "-V")
@@ -114,14 +114,15 @@ IF(NOT CMAKE_ASM${ASM_DIALECT}_COMPILER_ID)
   INCLUDE(CMakeDetermineCompilerId)
   CMAKE_DETERMINE_COMPILER_ID_VENDOR(ASM${ASM_DIALECT})
 
-  IF(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID)
-    MESSAGE(STATUS "The ASM${ASM_DIALECT} compiler identification is ${CMAKE_ASM${ASM_DIALECT}_COMPILER_ID}")
-  ELSE(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID)
-    MESSAGE(STATUS "The ASM${ASM_DIALECT} compiler identification is unknown")
-  ENDIF(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID)
-
 ENDIF()
 
+IF(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID)
+  MESSAGE(STATUS "The ASM${ASM_DIALECT} compiler identification is ${CMAKE_ASM${ASM_DIALECT}_COMPILER_ID}")
+ELSE(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID)
+  MESSAGE(STATUS "The ASM${ASM_DIALECT} compiler identification is unknown")
+ENDIF(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID)
+
+
 
 # If we have a gas/as cross compiler, they have usually some prefix, like
 # e.g. powerpc-linux-gas, arm-elf-gas or i586-mingw32msvc-gas , optionally

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

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


hooks/post-receive
-- 
CMake