File tree Expand file tree Collapse file tree 2 files changed +6
-5
lines changed
Expand file tree Collapse file tree 2 files changed +6
-5
lines changed Original file line number Diff line number Diff line change @@ -244,9 +244,10 @@ if(UNIX)
244244 # enable C++11 features
245245 add_definitions (-DLINUX_BUILD)
246246 add_definitions (-D_GLIBCXX_USE_C99)
247- set (CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -g -Wall -Wno-unused-variable" )
248- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -mtune=generic" )
249- set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden -mtune=generic" )
247+ set (GCC_COMMON_FLAGS "-fvisibility=hidden -mtune=generic -Wall -Werror -Wno-unused-variable" )
248+ set (CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -g" )
249+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GCC_COMMON_FLAGS} " )
250+ set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${GCC_COMMON_FLAGS} " )
250251 if (DFHACK_BUILD_64)
251252 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m64 -mno-avx" )
252253 set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m64 -mno-avx" )
Original file line number Diff line number Diff line change @@ -145,8 +145,8 @@ set(LIBPROTOC_SRCS
145145list (APPEND LIBPROTOBUF_FULL_SRCS ${LIBPROTOBUF_LITE_SRCS} )
146146
147147if (CMAKE_COMPILER_IS_GNUCC)
148- set (CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -Wno-sign-compare " )
149- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-result -Wno-unused-local-typedefs -Wno-misleading-indentation -Wno-class-memaccess" )
148+ set (CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} " )
149+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-result -Wno-unused-local-typedefs -Wno-misleading-indentation -Wno-class-memaccess -Wno-sign-compare " )
150150elseif (MSVC )
151151 # Disable warnings for integer conversion to smaller type
152152 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4267" )
You can’t perform that action at this time.
0 commit comments