Browse Source

cmake only init uavcan_board_ident if used

sbg
Daniel Agar 7 years ago
parent
commit
aef7a3cd9a
  1. 1
      CMakeLists.txt
  2. 2
      cmake/configs/nuttx_esc35-v1_default.cmake
  3. 2
      cmake/configs/nuttx_px4cannode-v1_default.cmake
  4. 2
      cmake/configs/nuttx_px4esc-v1_default.cmake
  5. 3
      cmake/configs/nuttx_s2740vc-v1_default.cmake

1
CMakeLists.txt

@ -124,7 +124,6 @@ execute_process( @@ -124,7 +124,6 @@ execute_process(
WORKING_DIRECTORY ${PX4_SOURCE_DIR}
)
px4_add_git_submodule(TARGET git_uavcan_board_ident PATH "cmake/configs/uavcan_board_ident")
px4_add_git_submodule(TARGET git_ecl PATH "src/lib/ecl")
px4_add_git_submodule(TARGET git_matrix PATH "src/lib/matrix")

2
cmake/configs/nuttx_esc35-v1_default.cmake

@ -18,6 +18,8 @@ add_definitions( @@ -18,6 +18,8 @@ add_definitions(
)
# Bring in common uavcan hardware identity definitions
include(common/px4_git)
px4_add_git_submodule(TARGET git_uavcan_board_ident PATH "cmake/configs/uavcan_board_ident")
include(configs/uavcan_board_ident/esc35-v1)
add_definitions(
-DHW_UAVCAN_NAME=${uavcanblid_name}

2
cmake/configs/nuttx_px4cannode-v1_default.cmake

@ -16,6 +16,8 @@ add_definitions( @@ -16,6 +16,8 @@ add_definitions(
)
# Bring in common uavcan hardware identity definitions
include(common/px4_git)
px4_add_git_submodule(TARGET git_uavcan_board_ident PATH "cmake/configs/uavcan_board_ident")
include(configs/uavcan_board_ident/px4cannode-v1)
add_definitions(
-DHW_UAVCAN_NAME=${uavcanblid_name}

2
cmake/configs/nuttx_px4esc-v1_default.cmake

@ -18,6 +18,8 @@ add_definitions( @@ -18,6 +18,8 @@ add_definitions(
)
# Bring in common uavcan hardware identity definitions
include(common/px4_git)
px4_add_git_submodule(TARGET git_uavcan_board_ident PATH "cmake/configs/uavcan_board_ident")
include(configs/uavcan_board_ident/px4esc-v1)
add_definitions(
-DHW_UAVCAN_NAME=${uavcanblid_name}

3
cmake/configs/nuttx_s2740vc-v1_default.cmake

@ -20,7 +20,8 @@ add_definitions( @@ -20,7 +20,8 @@ add_definitions(
#
# Bring in common uavcan hardware identity definitions
#
include(common/px4_git)
px4_add_git_submodule(TARGET git_uavcan_board_ident PATH "cmake/configs/uavcan_board_ident")
include(configs/uavcan_board_ident/s2740vc-v1)
# N.B. this would be uncommented when there is an APP

Loading…
Cancel
Save