diff options
| author | Brad King <brad.king@kitware.com> | 2020-12-08 15:16:11 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-12-08 10:16:20 -0500 |
| commit | 6aa3c3206e3c38d94e5c25f2d8fa726163944d01 (patch) | |
| tree | 42d3442297982657981252f9a562818654e3c84a | |
| parent | 70c9a3e29482acbf1db35b548b7264daf4927213 (diff) | |
| parent | 41b69348a54b03372c4972e0b0d29aa0c7bca187 (diff) | |
| download | cmake-6aa3c3206e3c38d94e5c25f2d8fa726163944d01.tar.gz | |
Merge topic 'remove-partial-intel-compiler-support' into release-3.19
41b69348a5 Revert "Intel: Add Intel DPC++ compiler identification"
f0babb53b3 Revert "Intel: Add Intel Clang compiler identification"
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Axel Huebl <axel.huebl@plasma.ninja>
Merge-request: !5583
| -rw-r--r-- | Help/variable/CMAKE_LANG_COMPILER_ID.rst | 2 | ||||
| -rw-r--r-- | Modules/CMakeCompilerIdDetection.cmake | 2 | ||||
| -rw-r--r-- | Modules/Compiler/IntelClang-DetermineCompiler.cmake | 7 | ||||
| -rw-r--r-- | Modules/Compiler/IntelDPCPP-DetermineCompiler.cmake | 7 |
4 files changed, 0 insertions, 18 deletions
diff --git a/Help/variable/CMAKE_LANG_COMPILER_ID.rst b/Help/variable/CMAKE_LANG_COMPILER_ID.rst index 99ff015003..8eb4fb612c 100644 --- a/Help/variable/CMAKE_LANG_COMPILER_ID.rst +++ b/Help/variable/CMAKE_LANG_COMPILER_ID.rst @@ -25,8 +25,6 @@ include: HP = Hewlett-Packard Compiler (hp.com) 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 26fb381127..a0f0dfacb6 100644 --- a/Modules/CMakeCompilerIdDetection.cmake +++ b/Modules/CMakeCompilerIdDetection.cmake @@ -78,8 +78,6 @@ function(compiler_id_detection outvar lang) ARMCC AppleClang ARMClang - IntelDPCPP - IntelClang Clang GNU MSVC diff --git a/Modules/Compiler/IntelClang-DetermineCompiler.cmake b/Modules/Compiler/IntelClang-DetermineCompiler.cmake deleted file mode 100644 index 3544be3442..0000000000 --- a/Modules/Compiler/IntelClang-DetermineCompiler.cmake +++ /dev/null @@ -1,7 +0,0 @@ - -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)") diff --git a/Modules/Compiler/IntelDPCPP-DetermineCompiler.cmake b/Modules/Compiler/IntelDPCPP-DetermineCompiler.cmake deleted file mode 100644 index 7bbb21c3a7..0000000000 --- a/Modules/Compiler/IntelDPCPP-DetermineCompiler.cmake +++ /dev/null @@ -1,7 +0,0 @@ - -set(_compiler_id_pp_test "defined(__clang__) && defined(__INTEL_DPCPP_COMPILER__)") - -include("${CMAKE_CURRENT_LIST_DIR}/Clang-DetermineCompilerInternal.cmake") - -string(APPEND _compiler_id_version_compute " -# define @PREFIX@COMPILER_VERSION_TWEAK @MACRO_DEC@(__INTEL_DPCPP_COMPILER__)") |