cmake remove circular linking and reorganize

- px4_add_module now requires MAIN
 - px4_add_library doesn't automatically link
This commit is contained in:
Daniel Agar
2018-04-29 21:48:54 -04:00
parent a8bc3d187f
commit ea3acb7121
576 changed files with 1406 additions and 2014 deletions
+11 -14
View File
@@ -30,17 +30,14 @@
# POSSIBILITY OF SUCH DAMAGE.
#
############################################################################
px4_add_module(
MODULE drivers__stm32
COMPILE_FLAGS
SRCS
drv_hrt.c
drv_io_timer.c
drv_pwm_servo.c
drv_pwm_trigger.c
drv_input_capture.c
drv_led_pwm.cpp
DEPENDS
platforms__common
)
# vim: set noet ft=cmake fenc=utf-8 ff=unix :
add_library(drivers_arch
drv_hrt.c
drv_io_timer.c
drv_pwm_servo.c
drv_pwm_trigger.c
drv_input_capture.c
drv_led_pwm.cpp
)
add_dependencies(drivers_arch prebuild_targets)
target_link_libraries(drivers_arch PRIVATE drivers_board)
+2 -5
View File
@@ -30,13 +30,10 @@
# POSSIBILITY OF SUCH DAMAGE.
#
############################################################################
px4_add_module(
MODULE drivers__stm32__adc
MODULE drivers__adc
MAIN adc
COMPILE_FLAGS
SRCS
adc.cpp
DEPENDS
platforms__common
)
# vim: set noet ft=cmake fenc=utf-8 ff=unix :
+1 -1
View File
@@ -62,7 +62,7 @@
#include <stm32_gpio.h>
#include <systemlib/err.h>
#include <systemlib/perf_counter.h>
#include <perf/perf_counter.h>
#include <uORB/topics/system_power.h>
#include <uORB/topics/adc_report.h>
+1 -1
View File
@@ -52,7 +52,7 @@
#include <ctype.h>
#include <systemlib/perf_counter.h>
#include <perf/perf_counter.h>
#include <systemlib/err.h>
#include <systemlib/systemlib.h>
#include <systemlib/px4_macros.h>
+4 -5
View File
@@ -30,13 +30,12 @@
# POSSIBILITY OF SUCH DAMAGE.
#
############################################################################
px4_add_module(
MODULE drivers__stm32__tone_alarm
MODULE drivers__tone_alarm
MAIN tone_alarm
COMPILE_FLAGS
SRCS
tone_alarm.cpp
DEPENDS
platforms__common
)
# vim: set noet ft=cmake fenc=utf-8 ff=unix :
tunes
)