summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2011-01-04 20:44:50 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2011-01-04 20:44:50 (GMT)
commit61063f12eb4dec062882f3fee1f65f045a2b9442 (patch)
tree0a71e617f2141e45bc8ba67e702541d0696376c0
parent138a79628b513fed2b2d5414b31b8c135c1a09dc (diff)
parentf1392dc90ba444259614f417cc0a9320c6d1df2c (diff)
downloadCMake-61063f12eb4dec062882f3fee1f65f045a2b9442.zip
CMake-61063f12eb4dec062882f3fee1f65f045a2b9442.tar.gz
CMake-61063f12eb4dec062882f3fee1f65f045a2b9442.tar.bz2
Merge topic 'recognize-TI-DSP'
f1392dc Recognize the Texas Instruments DSP compiler (#11645)
-rw-r--r--Modules/CMakeCCompilerId.c.in3
-rw-r--r--Modules/CMakeCXXCompilerId.cpp.in3
-rw-r--r--Modules/CMakeDetermineASMCompiler.cmake3
3 files changed, 9 insertions, 0 deletions
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})