diff options
| author | Even Rouault <even.rouault@mines-paris.org> | 2019-04-18 11:28:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-18 11:28:44 +0200 |
| commit | ab22c860e6e5356eb96ce41f49ec763f4df053e1 (patch) | |
| tree | b35752c8f8e4c3d00518a60e0ae2b03f1baf0450 /include | |
| parent | 4760c708ed7697178d55eac76332cdd63c54eb8c (diff) | |
| parent | 421653b9c61f253e800ca749e9b1a9ba0688d72a (diff) | |
| download | PROJ-ab22c860e6e5356eb96ce41f49ec763f4df053e1.tar.gz PROJ-ab22c860e6e5356eb96ce41f49ec763f4df053e1.zip | |
Merge pull request #1426 from mwtoews/intel
CMake: better support for Intel compiler
Diffstat (limited to 'include')
| -rw-r--r-- | include/proj/internal/internal.hpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/proj/internal/internal.hpp b/include/proj/internal/internal.hpp index 84fc1c2b..220c137b 100644 --- a/include/proj/internal/internal.hpp +++ b/include/proj/internal/internal.hpp @@ -53,7 +53,7 @@ #if ((defined(__clang__) && \ (__clang_major__ > 3 || \ (__clang_major__ == 3 && __clang_minor__ >= 7))) || \ - __GNUC__ >= 7) + (__GNUC__ >= 7 && !__INTEL_COMPILER)) /** Macro for fallthrough in a switch case construct */ #define PROJ_FALLTHROUGH [[clang::fallthrough]]; #else |