From 6c10cf18e4f06706af99daf22e45a124b2e98515 Mon Sep 17 00:00:00 2001 From: Daniel Agar Date: Tue, 6 Oct 2015 16:31:18 -0400 Subject: [PATCH] re-enable Werror --- cmake/common/px4_base.cmake | 2 +- src/drivers/px4flow/i2c_frame.h | 2 +- src/drivers/px4fmu/CMakeLists.txt | 1 - src/drivers/px4io/CMakeLists.txt | 1 - src/modules/attitude_estimator_ekf/CMakeLists.txt | 2 +- src/modules/commander/CMakeLists.txt | 2 +- src/modules/ekf_att_pos_estimator/CMakeLists.txt | 2 +- src/modules/land_detector/CMakeLists.txt | 1 - src/modules/mavlink/CMakeLists.txt | 2 +- src/modules/mc_att_control_multiplatform/CMakeLists.txt | 2 ++ src/modules/mc_pos_control_multiplatform/CMakeLists.txt | 2 +- src/modules/position_estimator_inav/CMakeLists.txt | 2 +- src/modules/simulator/CMakeLists.txt | 2 +- src/modules/uavcan/CMakeLists.txt | 4 +++- src/platforms/posix/drivers/gyrosim/CMakeLists.txt | 1 - src/systemcmds/mixer/CMakeLists.txt | 2 +- 16 files changed, 15 insertions(+), 15 deletions(-) diff --git a/cmake/common/px4_base.cmake b/cmake/common/px4_base.cmake index 797cb14fc1..1093d367e9 100644 --- a/cmake/common/px4_base.cmake +++ b/cmake/common/px4_base.cmake @@ -482,13 +482,13 @@ function(px4_add_common_flags) set(warnings -Wall + -Werror -Wno-sign-compare -Wextra #-Wshadow # very verbose due to eigen -Wfloat-equal -Wpointer-arith -Wmissing-declarations - -Wpacked -Wno-unused-parameter -Werror=format-security -Werror=array-bounds diff --git a/src/drivers/px4flow/i2c_frame.h b/src/drivers/px4flow/i2c_frame.h index a682c5f3de..43e10e417c 100644 --- a/src/drivers/px4flow/i2c_frame.h +++ b/src/drivers/px4flow/i2c_frame.h @@ -41,7 +41,7 @@ #ifndef I2C_FRAME_H_ #define I2C_FRAME_H_ -#define __STDC_FORMAT_MACROS 1 +#define __STDC_FORMAT_MACROS #include typedef struct i2c_frame diff --git a/src/drivers/px4fmu/CMakeLists.txt b/src/drivers/px4fmu/CMakeLists.txt index 335da06c1e..492aad5939 100644 --- a/src/drivers/px4fmu/CMakeLists.txt +++ b/src/drivers/px4fmu/CMakeLists.txt @@ -35,7 +35,6 @@ px4_add_module( MAIN fmu STACK 1200 COMPILE_FLAGS - -Weffc++ -Os SRCS fmu.cpp diff --git a/src/drivers/px4io/CMakeLists.txt b/src/drivers/px4io/CMakeLists.txt index 818d2c33d6..5c180c6f82 100644 --- a/src/drivers/px4io/CMakeLists.txt +++ b/src/drivers/px4io/CMakeLists.txt @@ -35,7 +35,6 @@ px4_add_module( MAIN px4io STACK 1200 COMPILE_FLAGS - -Weffc++ -Os SRCS px4io.cpp diff --git a/src/modules/attitude_estimator_ekf/CMakeLists.txt b/src/modules/attitude_estimator_ekf/CMakeLists.txt index 2c037d46bb..65ab7eff02 100644 --- a/src/modules/attitude_estimator_ekf/CMakeLists.txt +++ b/src/modules/attitude_estimator_ekf/CMakeLists.txt @@ -35,7 +35,7 @@ px4_add_module( MAIN attitude_estimator_ekf STACK 1200 COMPILE_FLAGS - -Wframe-larger-than=2400 + -Wframe-larger-than=3000 -Wno-float-equal SRCS diff --git a/src/modules/commander/CMakeLists.txt b/src/modules/commander/CMakeLists.txt index 7cd5b045ef..698177edb6 100644 --- a/src/modules/commander/CMakeLists.txt +++ b/src/modules/commander/CMakeLists.txt @@ -34,7 +34,7 @@ set(MODULE_CFLAGS -Os) if(NOT ${OS} STREQUAL "qurt") list(APPEND MODULE_CFLAGS - -Wframe-larger-than=2200) + -Wframe-larger-than=2600) endif() px4_add_module( MODULE modules__commander diff --git a/src/modules/ekf_att_pos_estimator/CMakeLists.txt b/src/modules/ekf_att_pos_estimator/CMakeLists.txt index 5a70282103..907bb31ff3 100644 --- a/src/modules/ekf_att_pos_estimator/CMakeLists.txt +++ b/src/modules/ekf_att_pos_estimator/CMakeLists.txt @@ -31,7 +31,7 @@ # ############################################################################ -set(MODULE_CFLAGS -Weffc++) +set(MODULE_CFLAGS ) if(NOT ${OS} STREQUAL "qurt") list(APPEND MODULE_CFLAGS -Wframe-larger-than=3400) endif() diff --git a/src/modules/land_detector/CMakeLists.txt b/src/modules/land_detector/CMakeLists.txt index 37030f1795..3e89ff1a6b 100644 --- a/src/modules/land_detector/CMakeLists.txt +++ b/src/modules/land_detector/CMakeLists.txt @@ -35,7 +35,6 @@ px4_add_module( MAIN land_detector STACK 1200 COMPILE_FLAGS - -Weffc++ -Os SRCS diff --git a/src/modules/mavlink/CMakeLists.txt b/src/modules/mavlink/CMakeLists.txt index f9897dd194..f7f2127c4b 100644 --- a/src/modules/mavlink/CMakeLists.txt +++ b/src/modules/mavlink/CMakeLists.txt @@ -35,11 +35,11 @@ px4_add_module( MAIN mavlink STACK 1200 COMPILE_FLAGS - -Weffc++ -Wno-attributes -Wno-packed -DMAVLINK_COMM_NUM_BUFFERS=3 -Wno-packed + -Wframe-larger-than=2000 -Os SRCS mavlink.c diff --git a/src/modules/mc_att_control_multiplatform/CMakeLists.txt b/src/modules/mc_att_control_multiplatform/CMakeLists.txt index 22f9d16ee8..0edd51ce57 100644 --- a/src/modules/mc_att_control_multiplatform/CMakeLists.txt +++ b/src/modules/mc_att_control_multiplatform/CMakeLists.txt @@ -33,6 +33,8 @@ px4_add_module( MODULE modules__mc_att_control_multiplatform MAIN mc_att_control_m + COMPILE_FLAGS + -Wframe-larger-than=1300 SRCS mc_att_control_main.cpp mc_att_control_start_nuttx.cpp diff --git a/src/modules/mc_pos_control_multiplatform/CMakeLists.txt b/src/modules/mc_pos_control_multiplatform/CMakeLists.txt index 28c2d0948a..76750b90de 100644 --- a/src/modules/mc_pos_control_multiplatform/CMakeLists.txt +++ b/src/modules/mc_pos_control_multiplatform/CMakeLists.txt @@ -34,7 +34,7 @@ px4_add_module( MODULE modules__mc_pos_control_multiplatform MAIN mc_pos_control_m COMPILE_FLAGS - -Wframe-larger-than=1200 + -Wframe-larger-than=1900 SRCS mc_pos_control_main.cpp diff --git a/src/modules/position_estimator_inav/CMakeLists.txt b/src/modules/position_estimator_inav/CMakeLists.txt index 0e801603a8..7c5393de9c 100644 --- a/src/modules/position_estimator_inav/CMakeLists.txt +++ b/src/modules/position_estimator_inav/CMakeLists.txt @@ -32,7 +32,7 @@ ############################################################################ set(MODULE_CFLAGS) if(NOT ${OS} STREQUAL "qurt") - list(APPEND MODULE_CFLAGS -Wframe-larger-than=3800) + list(APPEND MODULE_CFLAGS -Wframe-larger-than=3900) endif() px4_add_module( MODULE modules__position_estimator_inav diff --git a/src/modules/simulator/CMakeLists.txt b/src/modules/simulator/CMakeLists.txt index 1e81695b97..97daf37d10 100644 --- a/src/modules/simulator/CMakeLists.txt +++ b/src/modules/simulator/CMakeLists.txt @@ -40,10 +40,10 @@ px4_add_module( MODULE modules__simulator MAIN simulator COMPILE_FLAGS - -Weffc++ -Wno-attributes -Wno-packed -Wno-packed + -Wframe-larger-than=1500 SRCS ${SIMULATOR_SRCS} diff --git a/src/modules/uavcan/CMakeLists.txt b/src/modules/uavcan/CMakeLists.txt index f3d255d1e0..f9b5a3696d 100644 --- a/src/modules/uavcan/CMakeLists.txt +++ b/src/modules/uavcan/CMakeLists.txt @@ -35,7 +35,7 @@ set(uavcan_c_flags ${c_flags}) list(REMOVE_ITEM uavcan_c_flags -std=gnu++0x -D__CUSTOM_FILE_IO__) set(uavcan_cxx_flags ${cxx_flags}) -list(REMOVE_ITEM uavcan_cxx_flags -std=gnu++0x -std=c++11 -D__CUSTOM_FILE_IO__) +list(REMOVE_ITEM uavcan_cxx_flags -std=gnu++0x -std=c++11 -Wundef -Werror -D__CUSTOM_FILE_IO__) set(uavcan_deps git_uavcan) set(uavcan_platform generic) @@ -94,6 +94,8 @@ px4_add_module( MAIN uavcan STACK 3200 COMPILE_FLAGS + -Wframe-larger-than=1500 + -Wno-deprecated-declarations -O3 SRCS diff --git a/src/platforms/posix/drivers/gyrosim/CMakeLists.txt b/src/platforms/posix/drivers/gyrosim/CMakeLists.txt index 184df706d3..335bee65d6 100644 --- a/src/platforms/posix/drivers/gyrosim/CMakeLists.txt +++ b/src/platforms/posix/drivers/gyrosim/CMakeLists.txt @@ -35,7 +35,6 @@ px4_add_module( MAIN gyrosim STACK 1200 COMPILE_FLAGS - -Weffc++ -Os SRCS gyrosim.cpp diff --git a/src/systemcmds/mixer/CMakeLists.txt b/src/systemcmds/mixer/CMakeLists.txt index dd051b2772..99ce2b1bad 100644 --- a/src/systemcmds/mixer/CMakeLists.txt +++ b/src/systemcmds/mixer/CMakeLists.txt @@ -34,7 +34,7 @@ set(MIXER_CFLAGS -Os) if(${OS} STREQUAL "qurt") list(APPEND MIXER_CFLAGS -Wframe-larger-than=2176) else() - list(APPEND MIXER_CFLAGS -Wframe-larger-than=2048) + list(APPEND MIXER_CFLAGS -Wframe-larger-than=2064) endif() px4_add_module(