cmake enable -Wcast-align and disable per module

PX4 · Mar 16, 2019 · b35d048 · b35d048
1 parent 13dba60
commit b35d048
Show file tree

Hide file tree

Showing 68 changed files with 129 additions and 65 deletions.
diff --git a/boards/bitcraze/crazyflie/syslink/CMakeLists.txt b/boards/bitcraze/crazyflie/syslink/CMakeLists.txt
@@ -34,12 +34,13 @@
 px4_add_module(
 	MODULE modules__syslink
 	MAIN syslink
+	COMPILE_FLAGS
+		-Wno-cast-align # TODO: fix and enable
 	STACK_MAIN 1300
 	SRCS
 		syslink_main.cpp
 		syslink_bridge.cpp
 		syslink_memory.cpp
 		syslink_params.c
 		syslink.c
-	DEPENDS
 	)
diff --git a/cmake/px4_add_common_flags.cmake b/cmake/px4_add_common_flags.cmake
@@ -66,6 +66,7 @@ function(px4_add_common_flags)
 		-Werror
 
 		-Warray-bounds
+		-Wcast-align
 		-Wdisabled-optimization
 		-Wdouble-promotion
 		-Wfatal-errors
@@ -79,8 +80,6 @@ function(px4_add_common_flags)
 		-Wunknown-pragmas
 		-Wunused-variable
 
-		#-Wcast-align # TODO: fix and enable
-
 		# disabled warnings
 		-Wno-implicit-fallthrough # set appropriate level and update
 		-Wno-missing-field-initializers

diff --git a/cmake/px4_add_module.cmake b/cmake/px4_add_module.cmake
@@ -118,6 +118,10 @@ function(px4_add_module)
 		add_library(${MODULE} STATIC EXCLUDE_FROM_ALL ${CMAKE_CURRENT_BINARY_DIR}/${MODULE}_unity.cpp)
 		target_include_directories(${MODULE} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
 
+		if(COMPILE_FLAGS)
+			target_compile_options(${MODULE}_original PRIVATE ${COMPILE_FLAGS})
+		endif()
+
 		if(DEPENDS)
 			# using target_link_libraries for dependencies provides linking
 			#  as well as interface include and libraries

diff --git a/platforms/posix/src/px4_layer/CMakeLists.txt b/platforms/posix/src/px4_layer/CMakeLists.txt
@@ -54,6 +54,7 @@ add_library(px4_layer
 	${SHMEM_SRCS}
 )
 target_compile_definitions(px4_layer PRIVATE MODULE_NAME="px4")
+target_compile_options(px4_layer PRIVATE -Wno-cast-align) # TODO: fix and enable
 target_link_libraries(px4_layer PRIVATE work_queue)
 target_link_libraries(px4_layer PRIVATE px4_daemon)
 

diff --git a/platforms/qurt/cmake/px4_impl_os.cmake b/platforms/qurt/cmake/px4_impl_os.cmake
@@ -133,6 +133,7 @@ function(px4_os_add_flags)
 		-fmath-errno
 
 		-Wno-unknown-warning-option
+		-Wno-cast-align
 	)
 
 	# Clear -rdynamic flag which fails for hexagon

diff --git a/src/drivers/barometer/bmp280/CMakeLists.txt b/src/drivers/barometer/bmp280/CMakeLists.txt
@@ -34,6 +34,8 @@
 px4_add_module(
 	MODULE drivers__bmp280
 	MAIN bmp280
+	COMPILE_FLAGS
+		-Wno-cast-align # TODO: fix and enable	
 	STACK_MAIN
 		1200
 	SRCS

diff --git a/src/drivers/barometer/lps22hb/CMakeLists.txt b/src/drivers/barometer/lps22hb/CMakeLists.txt
@@ -33,7 +33,6 @@
 px4_add_module(
 	MODULE drivers__barometer__lps22hb
 	MAIN lps22hb
-	COMPILE_FLAGS
 	SRCS
 		lps22hb_main.cpp
 		LPS22HB.cpp

diff --git a/src/drivers/barometer/lps25h/CMakeLists.txt b/src/drivers/barometer/lps25h/CMakeLists.txt
@@ -35,11 +35,9 @@ px4_add_module(
 	MAIN lps25h
 	STACK_MAIN 1200
 	COMPILE_FLAGS
+		-Wno-cast-align # TODO: fix and enable
 	SRCS
 		lps25h.cpp
 		lps25h_i2c.cpp
 		lps25h_spi.cpp
-
-	DEPENDS
 	)
-
diff --git a/src/drivers/barometer/mpl3115a2/CMakeLists.txt b/src/drivers/barometer/mpl3115a2/CMakeLists.txt
@@ -30,17 +30,13 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 ############################################################################
-set(srcs
-	mpl3115a2_i2c.cpp
-	mpl3115a2.cpp
-)
-
 px4_add_module(
 	MODULE drivers__mpl3115a2
 	MAIN mpl3115a2
 	STACK_MAIN 1200
 	COMPILE_FLAGS
-	SRCS ${srcs}
-	DEPENDS
+		-Wno-cast-align # TODO: fix and enable
+	SRCS
+		mpl3115a2_i2c.cpp
+		mpl3115a2.cpp
 	)
-
diff --git a/src/drivers/barometer/ms5611/CMakeLists.txt b/src/drivers/barometer/ms5611/CMakeLists.txt
@@ -30,18 +30,15 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 ############################################################################
-set(srcs
-	ms5611_spi.cpp
-	ms5611_i2c.cpp
-	ms5611.cpp
-)
 
 px4_add_module(
 	MODULE drivers__ms5611
 	MAIN ms5611
 	STACK_MAIN 1500
 	COMPILE_FLAGS
-	SRCS ${srcs}
-	DEPENDS
+		-Wno-cast-align # TODO: fix and enable
+	SRCS
+		ms5611_spi.cpp
+		ms5611_i2c.cpp
+		ms5611.cpp
 	)
-
diff --git a/src/drivers/boards/common/kinetis/CMakeLists.txt b/src/drivers/boards/common/kinetis/CMakeLists.txt
@@ -37,4 +37,5 @@ add_library(drivers_boards_common_arch
 	board_reset.c
 	)
 add_dependencies(drivers_boards_common_arch prebuild_targets)
+target_compile_options(drivers_boards_common_arch PRIVATE -Wno-cast-align) # TODO: fix and enable
 target_link_libraries(drivers_boards_common_arch PRIVATE nuttx_arch)
diff --git a/src/drivers/boards/common/stm32/CMakeLists.txt b/src/drivers/boards/common/stm32/CMakeLists.txt
@@ -39,4 +39,5 @@ add_library(drivers_boards_common_arch
 	board_critmon.c
 )
 add_dependencies(drivers_boards_common_arch prebuild_targets)
+target_compile_options(drivers_boards_common_arch PRIVATE -Wno-cast-align) # TODO: fix and enable
 target_link_libraries(drivers_boards_common_arch PRIVATE nuttx_arch)
diff --git a/src/drivers/distance_sensor/leddar_one/CMakeLists.txt b/src/drivers/distance_sensor/leddar_one/CMakeLists.txt
@@ -34,9 +34,10 @@ px4_add_module(
 	MODULE drivers__leddar_one
 	MAIN leddar_one
 	STACK_MAIN 1200
+	COMPILE_FLAGS
+		-Wno-cast-align # TODO: fix and enable	
 	SRCS
 		leddar_one.cpp
 	MODULE_CONFIG
 		module.yaml
-	DEPENDS
 	)
diff --git a/src/drivers/distance_sensor/ll40ls/CMakeLists.txt b/src/drivers/distance_sensor/ll40ls/CMakeLists.txt
@@ -34,11 +34,10 @@ px4_add_module(
 	MODULE drivers__ll40ls
 	MAIN ll40ls
 	COMPILE_FLAGS
+		-Wno-cast-align # TODO: fix and enable
 	SRCS
 		ll40ls.cpp
 		LidarLite.cpp
 		LidarLiteI2C.cpp
 		LidarLitePWM.cpp
-	DEPENDS
 	)
-
diff --git a/src/drivers/distance_sensor/mb12xx/CMakeLists.txt b/src/drivers/distance_sensor/mb12xx/CMakeLists.txt
@@ -34,8 +34,7 @@ px4_add_module(
 	MODULE drivers__mb12xx
 	MAIN mb12xx
 	COMPILE_FLAGS
+		-Wno-cast-align # TODO: fix and enable
 	SRCS
 		mb12xx.cpp
-	DEPENDS
 	)
-
diff --git a/src/drivers/distance_sensor/sf0x/CMakeLists.txt b/src/drivers/distance_sensor/sf0x/CMakeLists.txt
@@ -33,6 +33,8 @@
 px4_add_module(
 	MODULE drivers__sf0x
 	MAIN sf0x
+	COMPILE_FLAGS
+		-Wno-cast-align # TODO: fix and enable		
 	SRCS
 		sf0x.cpp
 		sf0x_parser.cpp

diff --git a/src/drivers/distance_sensor/sf1xx/CMakeLists.txt b/src/drivers/distance_sensor/sf1xx/CMakeLists.txt
@@ -31,10 +31,10 @@
 #
 ############################################################################
 px4_add_module(
-
 	MODULE drivers__sf1xx
 	MAIN sf1xx
 	COMPILE_FLAGS
+		-Wno-cast-align # TODO: fix and enable
 	SRCS
 		sf1xx.cpp
 	DEPENDS

diff --git a/src/drivers/distance_sensor/srf02/CMakeLists.txt b/src/drivers/distance_sensor/srf02/CMakeLists.txt
@@ -34,8 +34,7 @@ px4_add_module(
 	MODULE drivers__srf02
 	MAIN srf02
 	COMPILE_FLAGS
+		-Wno-cast-align # TODO: fix and enable
 	SRCS
 		srf02.cpp
-	DEPENDS
 	)
-
diff --git a/src/drivers/distance_sensor/teraranger/CMakeLists.txt b/src/drivers/distance_sensor/teraranger/CMakeLists.txt
@@ -35,6 +35,7 @@ px4_add_module(
 	MAIN teraranger
 	STACK_MAIN 1200
 	COMPILE_FLAGS
+		-Wno-cast-align # TODO: fix and enable
 	SRCS
 		teraranger.cpp
 	DEPENDS

diff --git a/src/drivers/distance_sensor/tfmini/CMakeLists.txt b/src/drivers/distance_sensor/tfmini/CMakeLists.txt
@@ -34,11 +34,10 @@ px4_add_module(
 	MODULE drivers__tfmini
 	MAIN tfmini
 	COMPILE_FLAGS
+		-Wno-cast-align # TODO: fix and enable
 	SRCS
 		tfmini.cpp
 		tfmini_parser.cpp
 	MODULE_CONFIG
 		module.yaml
-	DEPENDS
 	)
-
diff --git a/src/drivers/distance_sensor/vl53lxx/CMakeLists.txt b/src/drivers/distance_sensor/vl53lxx/CMakeLists.txt
@@ -1,7 +1,41 @@
+############################################################################
+#
+#   Copyright (c) 2019 PX4 Development Team. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in
+#    the documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name PX4 nor the names of its contributors may be
+#    used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+############################################################################
+
 px4_add_module(
 	MODULE drivers__vl53lxx
 	MAIN vl53lxx
+	COMPILE_FLAGS
+		-Wno-cast-align # TODO: fix and enable	
 	SRCS
 		vl53lxx.cpp
 	)
-# vim: set noet ft=cmake fenc=utf-8 ff=unix :
diff --git a/src/drivers/gps/CMakeLists.txt b/src/drivers/gps/CMakeLists.txt
@@ -37,6 +37,8 @@ px4_add_module(
 	MODULE drivers__gps
 	MAIN gps
 	STACK_MAIN 1200
+	COMPILE_FLAGS
+		-Wno-cast-align # TODO: fix and enable
 	SRCS
 		gps.cpp
 		devices/src/gps_helper.cpp

diff --git a/src/drivers/imu/adis16448/CMakeLists.txt b/src/drivers/imu/adis16448/CMakeLists.txt
@@ -35,7 +35,7 @@ px4_add_module(
 	MAIN adis16448
 	STACK_MAIN 1200
 	COMPILE_FLAGS
+		-Wno-cast-align # TODO: fix and enable	
 	SRCS
 		adis16448.cpp
-	DEPENDS
 	)
diff --git a/src/drivers/imu/adis16477/CMakeLists.txt b/src/drivers/imu/adis16477/CMakeLists.txt
@@ -35,6 +35,7 @@ px4_add_module(
 	MAIN adis16477
 	STACK_MAIN 1200
 	COMPILE_FLAGS
+		-Wno-cast-align # TODO: fix and enable
 	SRCS
 		ADIS16477.cpp
 		ADIS16477_gyro.cpp

diff --git a/src/drivers/imu/adis16497/CMakeLists.txt b/src/drivers/imu/adis16497/CMakeLists.txt
@@ -35,6 +35,7 @@ px4_add_module(
 	MAIN adis16497
 	STACK_MAIN 1200
 	COMPILE_FLAGS
+		-Wno-cast-align # TODO: fix and enable	
 	SRCS
 		ADIS16497.cpp
 		ADIS16497_gyro.cpp

diff --git a/src/drivers/imu/bma180/CMakeLists.txt b/src/drivers/imu/bma180/CMakeLists.txt
@@ -34,8 +34,7 @@ px4_add_module(
 	MODULE drivers__bma180
 	MAIN bma180
 	COMPILE_FLAGS
+		-Wno-cast-align # TODO: fix and enable
 	SRCS
 		bma180.cpp
-	DEPENDS
 	)
-
diff --git a/src/drivers/imu/bmi055/CMakeLists.txt b/src/drivers/imu/bmi055/CMakeLists.txt
@@ -34,9 +34,10 @@ px4_add_module(
 	MODULE drivers__bmi055
 	MAIN bmi055
 	STACK_MAIN 1500
+	COMPILE_FLAGS
+		-Wno-cast-align # TODO: fix and enable		
 	SRCS		
 		BMI055_accel.cpp
 		BMI055_gyro.cpp
 		bmi055_main.cpp
 	)
-
diff --git a/src/drivers/imu/bmi160/CMakeLists.txt b/src/drivers/imu/bmi160/CMakeLists.txt
@@ -35,10 +35,9 @@ px4_add_module(
 	MAIN bmi160
 	STACK_MAIN 1200
 	COMPILE_FLAGS
+		-Wno-cast-align # TODO: fix and enable
 	SRCS
 		bmi160.cpp
 		bmi160_gyro.cpp
 		bmi160_main.cpp
-	DEPENDS
 	)
-
diff --git a/src/drivers/imu/fxas21002c/CMakeLists.txt b/src/drivers/imu/fxas21002c/CMakeLists.txt
@@ -35,7 +35,7 @@ px4_add_module(
 	MAIN fxas21002c
 	STACK_MAIN 1500
 	COMPILE_FLAGS
+		-Wno-cast-align # TODO: fix and enable
 	SRCS
 		fxas21002c.cpp
-	DEPENDS
 	)
diff --git a/src/drivers/imu/fxos8701cq/CMakeLists.txt b/src/drivers/imu/fxos8701cq/CMakeLists.txt
@@ -35,7 +35,7 @@ px4_add_module(
 	MAIN fxos8701cq
 	STACK_MAIN 1500
 	COMPILE_FLAGS
+		-Wno-cast-align # TODO: fix and enable
 	SRCS
 		fxos8701cq.cpp
-	DEPENDS
 	)
diff --git a/src/drivers/imu/l3gd20/CMakeLists.txt b/src/drivers/imu/l3gd20/CMakeLists.txt
@@ -35,8 +35,7 @@ px4_add_module(
 	MAIN l3gd20
 	STACK_MAIN 1500
 	COMPILE_FLAGS
+		-Wno-cast-align # TODO: fix and enable
 	SRCS
 		l3gd20.cpp
-	DEPENDS
 	)
-
diff --git a/src/drivers/imu/lsm303d/CMakeLists.txt b/src/drivers/imu/lsm303d/CMakeLists.txt
@@ -35,8 +35,7 @@ px4_add_module(
 	MAIN lsm303d
 	STACK_MAIN 1500
 	COMPILE_FLAGS
+		-Wno-cast-align # TODO: fix and enable
 	SRCS
 		lsm303d.cpp
-	DEPENDS
 	)
-
diff --git a/src/drivers/irlock/CMakeLists.txt b/src/drivers/irlock/CMakeLists.txt
@@ -34,8 +34,7 @@ px4_add_module(
 	MODULE drivers__irlock
 	MAIN irlock
 	COMPILE_FLAGS
+		-Wno-cast-align # TODO: fix and enable
 	SRCS
 		irlock.cpp
-	DEPENDS
 	)
-
diff --git a/src/drivers/kinetis/CMakeLists.txt b/src/drivers/kinetis/CMakeLists.txt
@@ -41,3 +41,4 @@ add_library(drivers_arch
 )
 add_dependencies(drivers_arch prebuild_targets)
 target_link_libraries(drivers_arch PRIVATE drivers_board)
+target_compile_options(drivers_arch PRIVATE -Wno-cast-align) # TODO: fix and enable