diff options
| author | Brad King <brad.king@kitware.com> | 2019-12-05 16:39:15 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-12-05 11:39:24 -0500 |
| commit | 684ad4296d28750b2ea27f723a8d8c8f6ceb5365 (patch) | |
| tree | e5a32c4cdf429aa5d99da6819c30e0cf7b9ba664 | |
| parent | 85fb95562bb7f04664f0b47d20f248c9779ff61f (diff) | |
| parent | df8372da0926a0a6fd995e50fc378bd699ea54dd (diff) | |
| download | cmake-684ad4296d28750b2ea27f723a8d8c8f6ceb5365.tar.gz | |
Merge topic 'pch-xcode-no-warning' into release-3.16
df8372da09 PCH: Do not add #pragma system_header for Xcode generator
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4098
| -rw-r--r-- | Modules/Compiler/Clang.cmake | 4 | ||||
| -rw-r--r-- | Modules/Compiler/GNU.cmake | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/Modules/Compiler/Clang.cmake b/Modules/Compiler/Clang.cmake index ea5a3b3583..5cc93284b9 100644 --- a/Modules/Compiler/Clang.cmake +++ b/Modules/Compiler/Clang.cmake @@ -98,7 +98,9 @@ else() ) set(CMAKE_PCH_EXTENSION .pch) - set(CMAKE_PCH_PROLOGUE "#pragma clang system_header") + if (NOT CMAKE_GENERATOR MATCHES "Xcode") + set(CMAKE_PCH_PROLOGUE "#pragma clang system_header") + endif() set(CMAKE_${lang}_COMPILE_OPTIONS_USE_PCH -Xclang -include-pch -Xclang <PCH_FILE>) set(CMAKE_${lang}_COMPILE_OPTIONS_CREATE_PCH -Xclang -emit-pch -Xclang -include -Xclang <PCH_HEADER>) endmacro() diff --git a/Modules/Compiler/GNU.cmake b/Modules/Compiler/GNU.cmake index 6960571db8..1c050a297e 100644 --- a/Modules/Compiler/GNU.cmake +++ b/Modules/Compiler/GNU.cmake @@ -111,7 +111,9 @@ macro(__compiler_gnu lang) list(APPEND CMAKE_${lang}_COMPILER_PREDEFINES_COMMAND "-dM" "-E" "-c" "${CMAKE_ROOT}/Modules/CMakeCXXCompilerABI.cpp") set(CMAKE_PCH_EXTENSION .gch) - set(CMAKE_PCH_PROLOGUE "#pragma GCC system_header") + if (NOT CMAKE_GENERATOR MATCHES "Xcode") + set(CMAKE_PCH_PROLOGUE "#pragma GCC system_header") + endif() set(CMAKE_${lang}_COMPILE_OPTIONS_USE_PCH -Winvalid-pch -include <PCH_HEADER>) set(CMAKE_${lang}_COMPILE_OPTIONS_CREATE_PCH -Winvalid-pch -x ${__pch_header_${lang}} -include <PCH_HEADER>) endmacro() |