mirror of
https://gitee.com/mirrors_PX4/PX4-Autopilot.git
synced 2026-10-30 01:23:34 +08:00
Fix to move DriverFramework includes to common
Nuttx now gets to link phase. But there are two unresolved symbols: arm-none-eabi/include/c++/4.7.4/bits/basic_string.h:1128: undefined reference to `std::string::assign(char const*, unsigned int)' arm-none-eabi/include/c++/4.7.4/bits/stl_list.h:1534: undefined reference to `std::__detail::_List_node_base::_M_hook(std::__detail::_List_node_base*)' Signed-off-by: Mark Charlebois <charlebm@gmail.com>
This commit is contained in:
+2
-1
@@ -336,8 +336,9 @@ endforeach()
|
|||||||
|
|
||||||
add_subdirectory(src/firmware/${OS})
|
add_subdirectory(src/firmware/${OS})
|
||||||
|
|
||||||
|
add_subdirectory(src/lib/DriverFramework/framework/src)
|
||||||
|
#add_dependencies(df_driver_framework nuttx_export_${CONFIG}.stamp)
|
||||||
if (NOT "${OS}" STREQUAL "nuttx")
|
if (NOT "${OS}" STREQUAL "nuttx")
|
||||||
add_subdirectory(src/lib/DriverFramework)
|
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if (config_io_board)
|
if (config_io_board)
|
||||||
|
|||||||
@@ -619,6 +619,7 @@ function(px4_add_common_flags)
|
|||||||
${CMAKE_BINARY_DIR}/src/modules/px4_messages
|
${CMAKE_BINARY_DIR}/src/modules/px4_messages
|
||||||
${CMAKE_BINARY_DIR}/src/modules
|
${CMAKE_BINARY_DIR}/src/modules
|
||||||
${CMAKE_SOURCE_DIR}/mavlink/include/mavlink
|
${CMAKE_SOURCE_DIR}/mavlink/include/mavlink
|
||||||
|
${CMAKE_SOURCE_DIR}/src/lib/DriverFramework/framework/include
|
||||||
)
|
)
|
||||||
|
|
||||||
list(APPEND added_include_dirs
|
list(APPEND added_include_dirs
|
||||||
|
|||||||
@@ -423,7 +423,6 @@ function(px4_os_add_flags)
|
|||||||
${nuttx_export_dir}/include/cxx
|
${nuttx_export_dir}/include/cxx
|
||||||
${nuttx_export_dir}/arch/chip
|
${nuttx_export_dir}/arch/chip
|
||||||
${nuttx_export_dir}/arch/common
|
${nuttx_export_dir}/arch/common
|
||||||
src/lib/DriverFramework/framework/include
|
|
||||||
)
|
)
|
||||||
set(added_link_dirs
|
set(added_link_dirs
|
||||||
${nuttx_export_dir}/libs
|
${nuttx_export_dir}/libs
|
||||||
|
|||||||
@@ -164,7 +164,6 @@ function(px4_os_add_flags)
|
|||||||
src/lib/eigen
|
src/lib/eigen
|
||||||
src/platforms/posix/include
|
src/platforms/posix/include
|
||||||
mavlink/include/mavlink
|
mavlink/include/mavlink
|
||||||
src/lib/DriverFramework/framework/include
|
|
||||||
)
|
)
|
||||||
|
|
||||||
if(UNIX AND APPLE)
|
if(UNIX AND APPLE)
|
||||||
|
|||||||
@@ -165,7 +165,6 @@ function(px4_os_add_flags)
|
|||||||
${DSPAL_ROOT}/sys/sys
|
${DSPAL_ROOT}/sys/sys
|
||||||
${DSPAL_ROOT}/mpu_spi/inc
|
${DSPAL_ROOT}/mpu_spi/inc
|
||||||
${DSPAL_ROOT}/uart_esc/inc
|
${DSPAL_ROOT}/uart_esc/inc
|
||||||
src/lib/DriverFramework/framework/include
|
|
||||||
src/platforms/qurt/include
|
src/platforms/qurt/include
|
||||||
src/platforms/posix/include
|
src/platforms/posix/include
|
||||||
)
|
)
|
||||||
|
|||||||
+1
-1
Submodule src/lib/DriverFramework updated: a759ad3142...10bc08d31f
Reference in New Issue
Block a user