[Cmake-commits] CMake branch, next, updated. v2.8.3-1110-g49ecd0d

[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  49ecd0db51101d1cba67d84c93a1b5cc92f10a7d (commit)
       via  f1392dc90ba444259614f417cc0a9320c6d1df2c (commit)
      from  b44a0b6b2c5e1ee9d2f144a4c0f68fadd250811c (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=49ecd0db51101d1cba67d84c93a1b5cc92f10a7d
commit 49ecd0db51101d1cba67d84c93a1b5cc92f10a7d
Merge: b44a0b6 f1392dc
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Dec 28 14:02:42 2010 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Dec 28 14:02:42 2010 -0500

    Merge topic 'recognize-TI-DSP' into next
    
    f1392dc Recognize the Texas Instruments DSP compiler (#11645)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f1392dc90ba444259614f417cc0a9320c6d1df2c
commit f1392dc90ba444259614f417cc0a9320c6d1df2c
Author:     Wojciech Migda <wojtek.golf at interia.pl>
AuthorDate: Tue Dec 28 12:15:47 2010 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Dec 28 12:22:38 2010 -0500

    Recognize the Texas Instruments DSP compiler (#11645)
    
    The TI DSP compiler predefines "__TI_COMPILER_VERSION__".  Use this to
    identify the C and C++ compilers.  For assembler language the C compiler
    executable is used:
    
      $ cl6x -h
      TMS320C6x C/C++ Compiler v6.1.11
      Tools Copyright (c) 1996-2009 Texas Instruments Incorporated
    
    Use this command-line option and output to recognize the assembler.

diff --git a/Modules/CMakeCCompilerId.c.in b/Modules/CMakeCCompilerId.c.in
index 2b80c88..ff48d62 100644
--- a/Modules/CMakeCCompilerId.c.in
+++ b/Modules/CMakeCCompilerId.c.in
@@ -45,6 +45,9 @@
 #elif defined(_CRAYC)
 # define COMPILER_ID "Cray"
 
+#elif defined(__TI_COMPILER_VERSION__)
+# define COMPILER_ID "TI_DSP"
+
 #elif defined(__GNUC__)
 # define COMPILER_ID "GNU"
 
diff --git a/Modules/CMakeCXXCompilerId.cpp.in b/Modules/CMakeCXXCompilerId.cpp.in
index 91f116a..7ab4080 100644
--- a/Modules/CMakeCXXCompilerId.cpp.in
+++ b/Modules/CMakeCXXCompilerId.cpp.in
@@ -47,6 +47,9 @@
 #elif defined(_CRAYC)
 # define COMPILER_ID "Cray"
 
+#elif defined(__TI_COMPILER_VERSION__)
+# define COMPILER_ID "TI_DSP"
+
 #elif defined(__GNUC__)
 # define COMPILER_ID "GNU"
 
diff --git a/Modules/CMakeDetermineASMCompiler.cmake b/Modules/CMakeDetermineASMCompiler.cmake
index 8353be4..7a443e0 100644
--- a/Modules/CMakeDetermineASMCompiler.cmake
+++ b/Modules/CMakeDetermineASMCompiler.cmake
@@ -64,6 +64,9 @@ IF(NOT CMAKE_ASM${ASM_DIALECT}_COMPILER_ID)
   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")
+  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")
 
   INCLUDE(CMakeDetermineCompilerId)
   CMAKE_DETERMINE_COMPILER_ID_VENDOR(ASM${ASM_DIALECT})

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

Summary of changes:
 Modules/CMakeCCompilerId.c.in           |    3 +++
 Modules/CMakeCXXCompilerId.cpp.in       |    3 +++
 Modules/CMakeDetermineASMCompiler.cmake |    3 +++
 3 files changed, 9 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake