diff options
| author | Brad King <brad.king@kitware.com> | 2020-05-12 10:52:14 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-05-12 06:52:40 -0400 |
| commit | 91dd23d3d544e25a88c8217b61d98a07ad73312c (patch) | |
| tree | 2cbba5844ecb103f503273947094fe31f6fa3754 | |
| parent | dc75a0728a33226adc632baf860d525a95b7f3ef (diff) | |
| parent | 6c2514dabec63929b2994b2ddd2b83cb5efa357e (diff) | |
| download | cmake-91dd23d3d544e25a88c8217b61d98a07ad73312c.tar.gz | |
Merge topic 'pch-msvc-pragma' into release-3.17
6c2514dabe MSVC: Use 'pragma system_header' in PCH only on cl 19.13 and above
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4736
| -rw-r--r-- | Modules/Platform/Windows-MSVC.cmake | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/Modules/Platform/Windows-MSVC.cmake b/Modules/Platform/Windows-MSVC.cmake index e1d6733f26..fb230580d5 100644 --- a/Modules/Platform/Windows-MSVC.cmake +++ b/Modules/Platform/Windows-MSVC.cmake @@ -331,13 +331,11 @@ macro(__windows_compiler_msvc lang) set(CMAKE_PCH_EXTENSION .pch) set(CMAKE_LINK_PCH ON) - if(MSVC_VERSION GREATER_EQUAL 1910) - # VS 2017 or greater - if (NOT ${CMAKE_${lang}_COMPILER_ID} STREQUAL "Clang") - set(CMAKE_PCH_PROLOGUE "#pragma system_header") - else() - set(CMAKE_PCH_PROLOGUE "#pragma clang system_header") - endif() + if (CMAKE_${lang}_COMPILER_ID STREQUAL "Clang") + set(CMAKE_PCH_PROLOGUE "#pragma clang system_header") + elseif(MSVC_VERSION GREATER_EQUAL 1913) + # At least MSVC toolet 14.13 from VS 2017 15.6 + set(CMAKE_PCH_PROLOGUE "#pragma system_header") endif() if (NOT ${CMAKE_${lang}_COMPILER_ID} STREQUAL "Clang") set(CMAKE_PCH_COPY_COMPILE_PDB ON) |