dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

Fixed order of processing df libs 

df libs were being defined after firmware directory was added and so
were not defined yet

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
This commit is contained in:
Mark Charlebois 2016-02-09 01:40:04 -08:00 committed by Julian Oes
parent 8fb8260bd4
commit 98a6facd55
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
CMakeLists.txt
View File

@ -330,6 +330,17 @@ include_directories(${ep_base}/Install/include)
execute_process(COMMAND cmake -E make_directory ${ep_base}/Install/lib) execute_process(COMMAND cmake -E make_directory ${ep_base}/Install/lib)
execute_process(COMMAND cmake -E make_directory ${ep_base}/Install/include) execute_process(COMMAND cmake -E make_directory ${ep_base}/Install/include)
#=============================================================================
# DriverFramework Drivers
#
message("ADDING DRIVERS")
set(df_driver_libs)
foreach(driver ${config_df_driver_list})
add_subdirectory(src/lib/DriverFramework/drivers/${driver})
list(APPEND df_driver_libs df_${driver})
message("adding driver: ${driver}")
endforeach()
#============================================================================= #=============================================================================
# subdirectories # subdirectories
# #
@ -360,16 +371,6 @@ if (config_io_board)
add_subdirectory(src/modules/px4iofirmware) add_subdirectory(src/modules/px4iofirmware)
endif() endif()
#=============================================================================
# DriverFramework Drivers
#
set(df_driver_libs)
foreach(driver ${config_df_driver_list})
add_subdirectory(src/lib/DriverFramework/drivers/${driver})
list(APPEND df_driver_libs df_${driver})
#message(STATUS "adding driver: ${driver}")
endforeach()
#============================================================================= #=============================================================================
# generate git version # generate git version
# #

1
src/firmware/qurt/CMakeLists.txt
View File

@ -19,6 +19,7 @@ else()
message("module_libraries = ${module_libraries}") message("module_libraries = ${module_libraries}")
message("target_libraries = ${target_libraries}") message("target_libraries = ${target_libraries}")
message("df_driver_libs = ${df_driver_libs}")
# Generate the DSP lib and stubs but not the apps side executable # Generate the DSP lib and stubs but not the apps side executable
# The Apps side executable is generated via the posix_eagle_xxxx target # The Apps side executable is generated via the posix_eagle_xxxx target
QURT_LIB(APP_NAME mainapp QURT_LIB(APP_NAME mainapp