Skip to content

Commit a2d2d3c

Browse files
moriartyBillyONeal
authored andcommitted
Re-enable no-unused-lamda-capture and no-format-trucation (#923)
* Re-enable no-unused-lamda-capture and no-format-trucation These were disabled as a quick fix for #778 in #779. * no-format-truncation was properly fixed in #787 * no-unused-lamda-capture was worked around in #732 * gaurds for gcc 5.4 were added in #849 but with #787 aren't needed * re-enable warning: -Wdelete-non-virtual-dtor - Was disabled in #779 and fixed in #844
1 parent 06619a7 commit a2d2d3c

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

Release/CMakeLists.txt

+2-6
Original file line numberDiff line numberDiff line change
@@ -169,12 +169,12 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR IOS)
169169
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-attributes -Wno-pointer-arith")
170170
elseif(CMAKE_SYSTEM_NAME MATCHES "Linux")
171171
set(WARNINGS -Wall -Wextra -Wcast-qual -Wconversion -Wformat=2 -Winit-self -Winvalid-pch -Wmissing-format-attribute -Wmissing-include-dirs -Wpacked -Wredundant-decls)
172-
set(LINUX_SUPPRESSIONS -Wno-overloaded-virtual -Wno-sign-conversion -Wno-deprecated -Wno-unknown-pragmas -Wno-reorder -Wno-char-subscripts -Wno-switch -Wno-unused-parameter -Wno-unused-variable -Wno-deprecated -Wno-unused-value -Wno-unknown-warning-option -Wno-return-type-c-linkage -Wno-unused-function -Wno-sign-compare -Wno-shorten-64-to-32 -Wno-unused-local-typedefs -Wno-delete-non-virtual-dtor -Wno-unused-lambda-capture)
172+
set(LINUX_SUPPRESSIONS -Wno-overloaded-virtual -Wno-sign-conversion -Wno-deprecated -Wno-unknown-pragmas -Wno-reorder -Wno-char-subscripts -Wno-switch -Wno-unused-parameter -Wno-unused-variable -Wno-deprecated -Wno-unused-value -Wno-unknown-warning-option -Wno-return-type-c-linkage -Wno-unused-function -Wno-sign-compare -Wno-shorten-64-to-32 -Wno-unused-local-typedefs)
173173
set(WARNINGS ${WARNINGS} ${LINUX_SUPPRESSIONS})
174174
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-return-type-c-linkage -Wno-unneeded-internal-declaration")
175175
else()
176176
set(WARNINGS -Wall -Wextra -Wcast-qual -Wconversion -Wformat=2 -Winit-self -Winvalid-pch -Wmissing-format-attribute -Wmissing-include-dirs -Wpacked -Wredundant-decls)
177-
set(OSX_SUPPRESSIONS -Wno-overloaded-virtual -Wno-sign-conversion -Wno-deprecated -Wno-unknown-pragmas -Wno-reorder -Wno-char-subscripts -Wno-switch -Wno-unused-parameter -Wno-unused-variable -Wno-deprecated -Wno-unused-value -Wno-unknown-warning-option -Wno-return-type-c-linkage -Wno-unused-function -Wno-sign-compare -Wno-shorten-64-to-32 -Wno-unused-local-typedefs -Wno-delete-non-virtual-dtor -Wno-unused-lambda-capture)
177+
set(OSX_SUPPRESSIONS -Wno-overloaded-virtual -Wno-sign-conversion -Wno-deprecated -Wno-unknown-pragmas -Wno-reorder -Wno-char-subscripts -Wno-switch -Wno-unused-parameter -Wno-unused-variable -Wno-deprecated -Wno-unused-value -Wno-unknown-warning-option -Wno-return-type-c-linkage -Wno-unused-function -Wno-sign-compare -Wno-shorten-64-to-32 -Wno-unused-local-typedefs)
178178
set(WARNINGS ${WARNINGS} ${OSX_SUPPRESSIONS})
179179

180180
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++ -Wno-return-type-c-linkage -Wno-unneeded-internal-declaration")
@@ -188,10 +188,6 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
188188
message("-- Setting gcc options")
189189

190190
set(WARNINGS -Wall -Wextra -Wunused-parameter -Wcast-align -Wcast-qual -Wconversion -Wformat=2 -Winit-self -Winvalid-pch -Wmissing-format-attribute -Wmissing-include-dirs -Wpacked -Wredundant-decls -Wunreachable-code)
191-
if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS "6.0")
192-
set(WARNINGS ${WARNINGS} -Wno-format-truncation)
193-
endif()
194-
195191
set(LD_FLAGS "${LD_FLAGS} -Wl,-z,defs")
196192

197193
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-strict-aliasing")

0 commit comments

Comments
 (0)