diff options
| author | Brad King <brad.king@kitware.com> | 2010-06-07 18:17:58 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2010-06-07 18:17:58 (GMT) |
| commit | bbd528c8007c03d35868461f3db679a157a3cca6 (patch) | |
| tree | aee3153586936b7778ab2c51e0cb0a47b9d2f098 | |
| parent | 2847d86c68590f8b330bd97b3f78f7033a3c87e0 (diff) | |
| parent | 571dc7489111893355deba710feee5990bce92e4 (diff) | |
| download | CMake-bbd528c8007c03d35868461f3db679a157a3cca6.zip CMake-bbd528c8007c03d35868461f3db679a157a3cca6.tar.gz CMake-bbd528c8007c03d35868461f3db679a157a3cca6.tar.bz2 | |
Merge branch 'clang'
| -rw-r--r-- | Modules/CMakeCCompilerId.c.in | 3 | ||||
| -rw-r--r-- | Modules/CMakeCXXCompilerId.cpp.in | 3 | ||||
| -rw-r--r-- | Modules/Compiler/Clang-C.cmake | 1 | ||||
| -rw-r--r-- | Modules/Compiler/Clang-CXX.cmake | 1 | ||||
| -rw-r--r-- | Modules/Platform/Linux-Clang-C.cmake | 1 | ||||
| -rw-r--r-- | Modules/Platform/Linux-Clang-CXX.cmake | 1 |
6 files changed, 10 insertions, 0 deletions
diff --git a/Modules/CMakeCCompilerId.c.in b/Modules/CMakeCCompilerId.c.in index 5d004c7..accda32 100644 --- a/Modules/CMakeCCompilerId.c.in +++ b/Modules/CMakeCCompilerId.c.in @@ -9,6 +9,9 @@ #if defined(__INTEL_COMPILER) || defined(__ICC) # define COMPILER_ID "Intel" +#elif defined(__clang__) +# define COMPILER_ID "Clang" + #elif defined(__BORLANDC__) # define COMPILER_ID "Borland" diff --git a/Modules/CMakeCXXCompilerId.cpp.in b/Modules/CMakeCXXCompilerId.cpp.in index 00ab8e2..4a32823 100644 --- a/Modules/CMakeCXXCompilerId.cpp.in +++ b/Modules/CMakeCXXCompilerId.cpp.in @@ -11,6 +11,9 @@ #elif defined(__INTEL_COMPILER) || defined(__ICC) # define COMPILER_ID "Intel" +#elif defined(__clang__) +# define COMPILER_ID "Clang" + #elif defined(__BORLANDC__) # define COMPILER_ID "Borland" diff --git a/Modules/Compiler/Clang-C.cmake b/Modules/Compiler/Clang-C.cmake new file mode 100644 index 0000000..f7baf68 --- /dev/null +++ b/Modules/Compiler/Clang-C.cmake @@ -0,0 +1 @@ +include(Compiler/GNU-C) diff --git a/Modules/Compiler/Clang-CXX.cmake b/Modules/Compiler/Clang-CXX.cmake new file mode 100644 index 0000000..d3c403a --- /dev/null +++ b/Modules/Compiler/Clang-CXX.cmake @@ -0,0 +1 @@ +include(Compiler/GNU-CXX) diff --git a/Modules/Platform/Linux-Clang-C.cmake b/Modules/Platform/Linux-Clang-C.cmake new file mode 100644 index 0000000..dbf8956 --- /dev/null +++ b/Modules/Platform/Linux-Clang-C.cmake @@ -0,0 +1 @@ +INCLUDE(Platform/Linux-GNU-C) diff --git a/Modules/Platform/Linux-Clang-CXX.cmake b/Modules/Platform/Linux-Clang-CXX.cmake new file mode 100644 index 0000000..8fe251c --- /dev/null +++ b/Modules/Platform/Linux-Clang-CXX.cmake @@ -0,0 +1 @@ +INCLUDE(Platform/Linux-GNU-CXX) |