File tree Expand file tree Collapse file tree 2 files changed +4
-2
lines changed
Expand file tree Collapse file tree 2 files changed +4
-2
lines changed Original file line number Diff line number Diff line change @@ -120,7 +120,9 @@ if(CV_GCC OR CV_CLANG)
120120 add_extra_compiler_option(-Wno-unnamed-type -template-args)
121121 add_extra_compiler_option(-Wno-comment )
122122 if (NOT OPENCV_SKIP_IMPLICIT_FALLTHROUGH
123- AND NOT " ${CMAKE_CXX_FLAGS} ${OPENCV_EXTRA_FLAGS} ${OPENCV_EXTRA_CXX_FLAGS} " MATCHES "implicit-fallthrough" )
123+ AND NOT " ${CMAKE_CXX_FLAGS} ${OPENCV_EXTRA_FLAGS} ${OPENCV_EXTRA_CXX_FLAGS} " MATCHES "implicit-fallthrough"
124+ AND (CV_GCC AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0.0)
125+ )
124126 add_extra_compiler_option(-Wimplicit-fallthrough=3)
125127 endif ()
126128 if (CV_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 7.2.0)
Original file line number Diff line number Diff line change @@ -65,7 +65,7 @@ using namespace std;
6565#if defined(__clang__)
6666#pragma clang diagnostic ignored "-Wimplicit-fallthrough"
6767#endif
68- #if defined(__GNUC__)
68+ #if defined(__GNUC__) && __GNUC__ >= 7
6969#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
7070#endif
7171
You can’t perform that action at this time.
0 commit comments