Set flags for building the proper DriverFramework target

The DF_TARGET cmake variable needs to be set to (linux, darwin, qurt, nuttx)
The define __DF_LINUX or __DF_QURT needs to be set.
The __DF_DARWIN target is untested

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
This commit is contained in:
Mark Charlebois 2015-11-16 23:24:59 -08:00
parent 62eba58fb4
commit 1bcb93180b
5 changed files with 19 additions and 2 deletions

View File

@ -150,6 +150,16 @@ list(GET config_args 1 BOARD)
list(GET config_args 2 LABEL)
set(target_name "${OS}-${BOARD}-${LABEL}")
if("${OS}" STREQUAL "posix")
if (APPLE)
set(DF_TARGET darwin)
else()
set(DF_TARGET linux)
endif()
else()
set(DF_TARGET ${OS})
endif()
message(STATUS "${target_name}")
# switch to ros CMake file if building ros
@ -327,6 +337,10 @@ endforeach()
add_subdirectory(src/firmware/${OS})
add_subdirectory(src/lib/DriverFramework)
if("${OS}" STREQUAL "nuttx")
add_dependencies(df_driver_framework nuttx_export_${BOARD})
endif()
if (config_io_board)
add_subdirectory(src/modules/px4iofirmware)
endif()

View File

@ -429,6 +429,7 @@ function(px4_os_add_flags)
)
set(added_definitions
-D__PX4_NUTTX
-D__DF_NUTTX
)
set(added_c_flags
-nodefaultlibs

View File

@ -171,6 +171,7 @@ if(UNIX AND APPLE)
set(added_definitions
-D__PX4_POSIX
-D__PX4_DARWIN
-D__DF_DARWIN
-DCLOCK_MONOTONIC=1
-Dnoreturn_function=__attribute__\(\(noreturn\)\)
-include ${PX4_INCLUDE_DIR}visibility.h
@ -185,6 +186,7 @@ else()
set(added_definitions
-D__PX4_POSIX
-D__PX4_LINUX
-D__DF_LINUX
-DCLOCK_MONOTONIC=1
-Dnoreturn_function=__attribute__\(\(noreturn\)\)
-include ${PX4_INCLUDE_DIR}visibility.h

@ -1 +1 @@
Subproject commit 45878058a7b37a9bba370396526b95cd7c2a3ab9
Subproject commit 3bbaf1a46dfdb0b3506dd4a0e4441f17b53c1944

@ -1 +1 @@
Subproject commit c8e885aac51aa34855bb3880d3dc916b9e278083
Subproject commit 93b8d366191fb24486e0484ca4f020c85ed6cfee