fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-04-14 10:07:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix to move DriverFramework includes to common

Browse Source 
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:
Mark Charlebois 2015-11-19 09:35:18 -08:00
parent 0383324a89
commit c4438bf50a
6 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -336,8 +336,9 @@ endforeach()
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")
add_subdirectory(src/lib/DriverFramework)
endif()
if (config_io_board)

1
cmake/common/px4_base.cmake
View File

@ -619,6 +619,7 @@ function(px4_add_common_flags)
${CMAKE_BINARY_DIR}/src/modules/px4_messages
${CMAKE_BINARY_DIR}/src/modules
${CMAKE_SOURCE_DIR}/mavlink/include/mavlink
${CMAKE_SOURCE_DIR}/src/lib/DriverFramework/framework/include
)
list(APPEND added_include_dirs

1
cmake/nuttx/px4_impl_nuttx.cmake
View File

@ -423,7 +423,6 @@ function(px4_os_add_flags)
${nuttx_export_dir}/include/cxx
${nuttx_export_dir}/arch/chip
${nuttx_export_dir}/arch/common
src/lib/DriverFramework/framework/include
)
set(added_link_dirs
${nuttx_export_dir}/libs

1
cmake/posix/px4_impl_posix.cmake
View File

@ -164,7 +164,6 @@ function(px4_os_add_flags)
src/lib/eigen
src/platforms/posix/include
mavlink/include/mavlink
src/lib/DriverFramework/framework/include
)
if(UNIX AND APPLE)

1
cmake/qurt/px4_impl_qurt.cmake
View File

@ -165,7 +165,6 @@ function(px4_os_add_flags)
${DSPAL_ROOT}/sys/sys
${DSPAL_ROOT}/mpu_spi/inc
${DSPAL_ROOT}/uart_esc/inc
src/lib/DriverFramework/framework/include
src/platforms/qurt/include
src/platforms/posix/include
)

2
src/lib/DriverFramework

@ -1 +1 @@
Subproject commit a759ad3142b3b30d4e3a3157ec684966f7dcc83c
Subproject commit 10bc08d31fe0cddb997b3349f34a7ea38c5c7b9d