diff options
| author | Brad King <brad.king@kitware.com> | 2019-11-12 14:34:36 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-11-12 14:35:38 (GMT) |
| commit | ffa9965700cfebce4ea80b5b1a191a5d19c85a29 (patch) | |
| tree | 2ea7a17958b9b4e72d00469cd7af757daa9cf8ce | |
| parent | 7a08f0d8dd7c4337c397b1227c2d3792c2a21215 (diff) | |
| parent | 77a8f9ecbcf6458eb07e91a12035a34532d53c7c (diff) | |
| download | CMake-ffa9965700cfebce4ea80b5b1a191a5d19c85a29.zip CMake-ffa9965700cfebce4ea80b5b1a191a5d19c85a29.tar.gz CMake-ffa9965700cfebce4ea80b5b1a191a5d19c85a29.tar.bz2 | |
Merge topic 'pch-cray-classic' into release-3.16
77a8f9ecbc Tests: Fix ExportImport PCH expectation on Cray Classic compiler
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4033
| -rw-r--r-- | Tests/ExportImport/Import/Interface/pch_iface_test.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Tests/ExportImport/Import/Interface/pch_iface_test.cpp b/Tests/ExportImport/Import/Interface/pch_iface_test.cpp index a460d0d..a18bbde 100644 --- a/Tests/ExportImport/Import/Interface/pch_iface_test.cpp +++ b/Tests/ExportImport/Import/Interface/pch_iface_test.cpp @@ -3,7 +3,7 @@ # ifndef PCH_PCH_H_INCLUDED # error "Expected PCH_PCH_H_INCLUDED." # endif -#elif defined(__PGIC__) || defined(__ibmxl__) +#elif defined(__PGIC__) || defined(__ibmxl__) || defined(_CRAYC) // No PCH expected but these compilers define macros below. #elif defined(__GNUC__) || defined(__clang__) || defined(_INTEL_COMPILER) || \ defined(_MSC_VER) |