summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2020-10-01 11:55:08 (GMT)
committerKitware Robot <kwrobot@kitware.com>2020-10-01 11:55:13 (GMT)
commit9fc742041ba16f11de5c370522d79cc382a0ec68 (patch)
tree4da10e0ca028039333480be905f854184c1c9949
parent431f1183ef0b700168befb27b13c7d258004bba9 (diff)
parent5c3a93ab88e80d1387c861bfbdcb8cb72a828f36 (diff)
downloadCMake-9fc742041ba16f11de5c370522d79cc382a0ec68.zip
CMake-9fc742041ba16f11de5c370522d79cc382a0ec68.tar.gz
CMake-9fc742041ba16f11de5c370522d79cc382a0ec68.tar.bz2
Merge topic 'intel-clang'
5c3a93ab88 Intel: Add Intel Clang compiler identification Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5300
-rw-r--r--Help/variable/CMAKE_LANG_COMPILER_ID.rst1
-rw-r--r--Modules/CMakeCompilerIdDetection.cmake1
-rw-r--r--Modules/Compiler/IntelClang-DetermineCompiler.cmake7
3 files changed, 9 insertions, 0 deletions
diff --git a/Help/variable/CMAKE_LANG_COMPILER_ID.rst b/Help/variable/CMAKE_LANG_COMPILER_ID.rst
index c495b71..99ff015 100644
--- a/Help/variable/CMAKE_LANG_COMPILER_ID.rst
+++ b/Help/variable/CMAKE_LANG_COMPILER_ID.rst
@@ -26,6 +26,7 @@ include:
IAR = IAR Systems (iar.com)
Intel = Intel Compiler (intel.com)
IntelDPCPP = Intel DPCPP Compiler (intel.com)
+ IntelClang = Intel Clang Compiler (intel.com)
MSVC = Microsoft Visual Studio (microsoft.com)
NVIDIA = NVIDIA CUDA Compiler (nvidia.com)
OpenWatcom = Open Watcom (openwatcom.org)
diff --git a/Modules/CMakeCompilerIdDetection.cmake b/Modules/CMakeCompilerIdDetection.cmake
index 176e768..26fb381 100644
--- a/Modules/CMakeCompilerIdDetection.cmake
+++ b/Modules/CMakeCompilerIdDetection.cmake
@@ -79,6 +79,7 @@ function(compiler_id_detection outvar lang)
AppleClang
ARMClang
IntelDPCPP
+ IntelClang
Clang
GNU
MSVC
diff --git a/Modules/Compiler/IntelClang-DetermineCompiler.cmake b/Modules/Compiler/IntelClang-DetermineCompiler.cmake
new file mode 100644
index 0000000..3544be3
--- /dev/null
+++ b/Modules/Compiler/IntelClang-DetermineCompiler.cmake
@@ -0,0 +1,7 @@
+
+set(_compiler_id_pp_test "defined(__clang__) && defined(__INTEL_CLANG_COMPILER)")
+
+include("${CMAKE_CURRENT_LIST_DIR}/Clang-DetermineCompilerInternal.cmake")
+
+string(APPEND _compiler_id_version_compute "
+# define @PREFIX@COMPILER_VERSION_TWEAK @MACRO_DEC@(__INTEL_CLANG_COMPILER)")