From aef7a3cd9aed80b2324ddcdc85c87d441b044b19 Mon Sep 17 00:00:00 2001 From: Daniel Agar Date: Sun, 10 Dec 2017 17:28:05 -0500 Subject: [PATCH] cmake only init uavcan_board_ident if used --- CMakeLists.txt | 1 - cmake/configs/nuttx_esc35-v1_default.cmake | 2 ++ cmake/configs/nuttx_px4cannode-v1_default.cmake | 2 ++ cmake/configs/nuttx_px4esc-v1_default.cmake | 2 ++ cmake/configs/nuttx_s2740vc-v1_default.cmake | 3 ++- 5 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4b9fcadf3e..80d1164f82 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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") diff --git a/cmake/configs/nuttx_esc35-v1_default.cmake b/cmake/configs/nuttx_esc35-v1_default.cmake index cc78a74881..c909b7c655 100644 --- a/cmake/configs/nuttx_esc35-v1_default.cmake +++ b/cmake/configs/nuttx_esc35-v1_default.cmake @@ -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} diff --git a/cmake/configs/nuttx_px4cannode-v1_default.cmake b/cmake/configs/nuttx_px4cannode-v1_default.cmake index b97e05e16f..e8552e6a1b 100644 --- a/cmake/configs/nuttx_px4cannode-v1_default.cmake +++ b/cmake/configs/nuttx_px4cannode-v1_default.cmake @@ -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} diff --git a/cmake/configs/nuttx_px4esc-v1_default.cmake b/cmake/configs/nuttx_px4esc-v1_default.cmake index 1adf33a879..1a1aeb768b 100644 --- a/cmake/configs/nuttx_px4esc-v1_default.cmake +++ b/cmake/configs/nuttx_px4esc-v1_default.cmake @@ -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} diff --git a/cmake/configs/nuttx_s2740vc-v1_default.cmake b/cmake/configs/nuttx_s2740vc-v1_default.cmake index 6512bf6c82..772ad7bf36 100644 --- a/cmake/configs/nuttx_s2740vc-v1_default.cmake +++ b/cmake/configs/nuttx_s2740vc-v1_default.cmake @@ -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