diff options
| author | Tor Egge <Tor.Egge@broadpark.no> | 2019-05-08 13:05:40 +0200 |
|---|---|---|
| committer | Tor Egge <Tor.Egge@broadpark.no> | 2019-05-08 13:05:40 +0200 |
| commit | 83e2da467bb0a2096720ecfc888044a1361439d0 (patch) | |
| tree | 831406c96d6012ffa0b1591a4519e3c8e0f47b2d /logd | |
| parent | adefed58438494c8dbd07542eaf6fdf900db74fa (diff) | |
Avoid unknown warning options when using clang.
Diffstat (limited to 'logd')
| -rw-r--r-- | logd/src/logd/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | logd/src/logd/log_protocol_proto.h | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/logd/src/logd/CMakeLists.txt b/logd/src/logd/CMakeLists.txt index 629c7b1637a..1b2b078ac94 100644 --- a/logd/src/logd/CMakeLists.txt +++ b/logd/src/logd/CMakeLists.txt @@ -7,7 +7,9 @@ find_package(Protobuf REQUIRED) protobuf_generate_cpp(logd_PROTOBUF_SRCS logd_PROTOBUF_HDRS ../../../logserver/src/protobuf/log_protocol.proto) # protoc-generated files emit compiler warnings that we normally treat as errors. -set_source_files_properties(${logd_PROTOBUF_SRCS} PROPERTIES COMPILE_FLAGS "-Wno-suggest-override") +if (NOT "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") + set_source_files_properties(${logd_PROTOBUF_SRCS} PROPERTIES COMPILE_FLAGS "-Wno-suggest-override") +endif() vespa_add_library(logd STATIC SOURCES diff --git a/logd/src/logd/log_protocol_proto.h b/logd/src/logd/log_protocol_proto.h index a8d5e4aa208..6f82b5d28b8 100644 --- a/logd/src/logd/log_protocol_proto.h +++ b/logd/src/logd/log_protocol_proto.h @@ -3,7 +3,9 @@ #pragma once #pragma GCC diagnostic push +#ifndef __clang__ #pragma GCC diagnostic ignored "-Wsuggest-override" +#endif #include "log_protocol.pb.h" |