Comment out Werror flag in cmake script

Werror flag should be only enabled on developer's machine, not for
users using the product.
Also fix formatting.
This commit is contained in:
Chocobo1 2018-05-05 20:57:05 +08:00 committed by sledgehammer999
parent 501191289b
commit 31989740cd
No known key found for this signature in database
GPG key ID: 6E4A2D025B7CC9A2

View file

@ -11,18 +11,17 @@ macro(qbt_set_compiler_options)
#-Wshadow -Wconversion ? #-Wshadow -Wconversion ?
set(_GCC_COMMON_C_AND_CXX_FLAGS "-Wall -Wextra" set(_GCC_COMMON_C_AND_CXX_FLAGS "-Wall -Wextra"
"-Wfloat-equal -Wcast-qual -Wcast-align" "-Wfloat-equal -Wcast-qual -Wcast-align"
"-Wsign-conversion -Winvalid-pch -Werror=return-type -Wno-long-long" "-Wsign-conversion -Winvalid-pch -Wno-long-long"
# -fstack-protector-all #"-fstack-protector-all"
"-Werror -Wno-error=deprecated-declarations" #"-Werror -Wno-error=deprecated-declarations"
) )
set(_GCC_COMMON_CXX_FLAGS "-fexceptions -frtti" set(_GCC_COMMON_CXX_FLAGS "-fexceptions -frtti"
"-Woverloaded-virtual -Wold-style-cast" "-Woverloaded-virtual -Wold-style-cast"
"-Wnon-virtual-dtor -Wfloat-equal -Wcast-qual -Wcast-align" "-Wnon-virtual-dtor -Wfloat-equal -Wcast-qual -Wcast-align"
"-Werror=overloaded-virtual"
#"-Weffc++" #"-Weffc++"
"-Werror -Wno-error=cpp" #"-Werror -Wno-error=cpp"
# we should modify code to make these ones obsolete # we should modify code to make these ones obsolete
"-Wno-error=sign-conversion -Wno-error=float-equal" #"-Wno-error=sign-conversion -Wno-error=float-equal"
) )
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.9) if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.9)