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
+5 -11
View File
@@ -31,14 +31,8 @@
#
############################################################################
px4_add_module(
MODULE modules__muorb__adsp
INCLUDES
${PX4_SOURCE_DIR}/src/modules/uORB
SRCS
px4muorb.cpp
uORBFastRpcChannel.cpp
DEPENDS
generate_px4muorb_stubs
platforms__common
)
px4_add_library(modules__muorb__adsp
px4muorb.cpp
uORBFastRpcChannel.cpp
)
target_include_directories(modules__muorb__adsp PRIVATE ${PX4_SOURCE_DIR}/src/modules/uORB)
+1 -1
View File
@@ -42,7 +42,7 @@
#include "px4_log.h"
#include "uORB/topics/sensor_combined.h"
#include "uORB.h"
#include "systemlib/param/param.h"
#include <parameters/param.h>
#include <shmem.h>
__BEGIN_DECLS
-4
View File
@@ -30,7 +30,6 @@
# POSSIBILITY OF SUCH DAMAGE.
#
############################################################################
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PX4_SOURCE_DIR}/cmake/cmake_hexagon")
include(hexagon_sdk)
px4_add_module(
@@ -43,7 +42,4 @@ px4_add_module(
uORBKraitFastRpcChannel.cpp
px4muorb_KraitRpcWrapper.cpp
muorb_main.cpp
DEPENDS
platforms__common
generate_px4muorb_stubs
)
@@ -36,7 +36,7 @@
#include <fcntl.h>
#include "px4muorb_KraitRpcWrapper.hpp"
#include <rpcmem.h>
#include "px4muorb.h"
#include <px4muorb.h>
#include "px4_log.h"
#include <shmem.h>
#include <drivers/drv_hrt.h>