diff options
| author | Brad King <brad.king@kitware.com> | 2021-02-10 12:45:53 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-02-10 07:46:33 -0500 |
| commit | 7228faa109ad0b1052e897d2e3087f361b62ccbb (patch) | |
| tree | 198371105c459a1e3a82fff6b3451b6273b2a51d | |
| parent | 98597aec1a9e54fb179520eba3e155f3c0511356 (diff) | |
| parent | 2fc5e5dba903da4c845b41f60fa9adb59c7cfbd1 (diff) | |
| download | cmake-7228faa109ad0b1052e897d2e3087f361b62ccbb.tar.gz | |
Merge topic 'clang-imsvc' into release-3.19
2fc5e5dba9 Clang: Use -imsvc for system include only with MSVC-like front-end
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Thomas Bernard <thomas@famillebernardgouriou.fr>
Merge-request: !5792
| -rw-r--r-- | Modules/Compiler/Clang.cmake | 1 | ||||
| -rw-r--r-- | Modules/Platform/Windows-Clang.cmake | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/Modules/Compiler/Clang.cmake b/Modules/Compiler/Clang.cmake index 27692c2fe8..c43265d585 100644 --- a/Modules/Compiler/Clang.cmake +++ b/Modules/Compiler/Clang.cmake @@ -19,7 +19,6 @@ if("x${CMAKE_C_SIMULATE_ID}" STREQUAL "xMSVC" OR "x${CMAKE_CXX_SIMULATE_ID}" STREQUAL "xMSVC" OR "x${CMAKE_Fortran_SIMULATE_ID}" STREQUAL "xMSVC") macro(__compiler_clang lang) - set(CMAKE_INCLUDE_SYSTEM_FLAG_${lang} "-imsvc ") endmacro() else() include(Compiler/GNU) diff --git a/Modules/Platform/Windows-Clang.cmake b/Modules/Platform/Windows-Clang.cmake index 389d6ab024..7697407fd7 100644 --- a/Modules/Platform/Windows-Clang.cmake +++ b/Modules/Platform/Windows-Clang.cmake @@ -169,6 +169,7 @@ if("x${CMAKE_C_SIMULATE_ID}" STREQUAL "xMSVC" macro(__windows_compiler_clang_base lang) set(_COMPILE_${lang} "${_COMPILE_${lang}_MSVC}") __windows_compiler_msvc(${lang}) + set(CMAKE_INCLUDE_SYSTEM_FLAG_${lang} "-imsvc ") endmacro() else() cmake_policy(GET CMP0091 __WINDOWS_CLANG_CMP0091) |