Brad Bishop | e42b3e3 | 2020-01-15 22:08:42 -0500 | [diff] [blame^] | 1 | From d41e2bef1c39dcbc4896b1dd7ab168da530672b5 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Mon, 30 Dec 2019 13:33:39 -0800 |
| 4 | Subject: [PATCH] cmake: Disable -Wno-misleading-indentation with clang-10 onwards |
| 5 | |
| 6 | clang also introduced this warning now |
| 7 | |
| 8 | Upstream-Status: Submitted [https://github.com/eclipse/upm/pull/693] |
| 9 | |
| 10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 11 | --- |
| 12 | CMakeLists.txt | 5 +++++ |
| 13 | 1 file changed, 5 insertions(+) |
| 14 | |
| 15 | diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 16 | index 069e4902..47c7f4c3 100644 |
| 17 | --- a/CMakeLists.txt |
| 18 | +++ b/CMakeLists.txt |
| 19 | @@ -99,6 +99,11 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_ |
| 20 | list (APPEND C_CXX_WARNING_FLAGS -Wno-misleading-indentation) |
| 21 | endif () |
| 22 | |
| 23 | +# clang-10 added -Wmisleading-indentation as well, skipp it too |
| 24 | +if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "9") |
| 25 | + list (APPEND C_CXX_WARNING_FLAGS -Wno-misleading-indentation) |
| 26 | +endif () |
| 27 | + |
| 28 | # Warnings as errors? |
| 29 | if (WERROR) |
| 30 | list (APPEND C_CXX_WARNING_FLAGS -Werror) |
| 31 | -- |
| 32 | 2.24.1 |
| 33 | |