Browse Source

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>
sbg
Mark Charlebois 9 years ago committed by Julian Oes
parent
commit
98a6facd55
  1. 21
      CMakeLists.txt
  2. 1
      src/firmware/qurt/CMakeLists.txt

21
CMakeLists.txt

@ -330,6 +330,17 @@ include_directories(${ep_base}/Install/include) @@ -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/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
#
@ -360,16 +371,6 @@ if (config_io_board) @@ -360,16 +371,6 @@ if (config_io_board)
add_subdirectory(src/modules/px4iofirmware)
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
#

1
src/firmware/qurt/CMakeLists.txt

@ -19,6 +19,7 @@ else() @@ -19,6 +19,7 @@ else()
message("module_libraries = ${module_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
# The Apps side executable is generated via the posix_eagle_xxxx target
QURT_LIB(APP_NAME mainapp

Loading…
Cancel
Save