From ded055f71d81fd19594d1a1a93ffbf918c878d82 Mon Sep 17 00:00:00 2001 From: Daniel Agar Date: Sat, 9 Dec 2017 20:09:13 -0500 Subject: [PATCH] cmake only init cmake_hexagon if used --- CMakeLists.txt | 1 - cmake/configs/posix_sdflight_default.cmake | 5 ++++- cmake/configs/posix_sdflight_legacy.cmake | 3 +++ cmake/configs/qurt_sdflight_default.cmake | 3 +++ cmake/configs/qurt_sdflight_legacy.cmake | 3 +++ 5 files changed, 13 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4f80bac70e..4b9fcadf3e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -124,7 +124,6 @@ execute_process( WORKING_DIRECTORY ${PX4_SOURCE_DIR} ) -px4_add_git_submodule(TARGET git_cmake_hexagon PATH "cmake/cmake_hexagon") 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/posix_sdflight_default.cmake b/cmake/configs/posix_sdflight_default.cmake index dd08e2f932..ce160d7213 100644 --- a/cmake/configs/posix_sdflight_default.cmake +++ b/cmake/configs/posix_sdflight_default.cmake @@ -1,3 +1,6 @@ +include(common/px4_git) +px4_add_git_submodule(TARGET git_cmake_hexagon PATH "cmake/cmake_hexagon") + include(posix/px4_impl_posix) # Get $QC_SOC_TARGET from environment if existing. @@ -83,4 +86,4 @@ set(config_module_list platforms/common platforms/posix/px4_layer platforms/posix/work_queue - ) \ No newline at end of file + ) diff --git a/cmake/configs/posix_sdflight_legacy.cmake b/cmake/configs/posix_sdflight_legacy.cmake index 2a70def784..476a5aea54 100644 --- a/cmake/configs/posix_sdflight_legacy.cmake +++ b/cmake/configs/posix_sdflight_legacy.cmake @@ -1,3 +1,6 @@ +include(common/px4_git) +px4_add_git_submodule(TARGET git_cmake_hexagon PATH "cmake/cmake_hexagon") + include(posix/px4_impl_posix) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PX4_SOURCE_DIR}/cmake/cmake_hexagon") diff --git a/cmake/configs/qurt_sdflight_default.cmake b/cmake/configs/qurt_sdflight_default.cmake index 5556ec3909..88e9208bb5 100644 --- a/cmake/configs/qurt_sdflight_default.cmake +++ b/cmake/configs/qurt_sdflight_default.cmake @@ -1,3 +1,6 @@ +include(common/px4_git) +px4_add_git_submodule(TARGET git_cmake_hexagon PATH "cmake/cmake_hexagon") + include(qurt/px4_impl_qurt) if ("$ENV{HEXAGON_SDK_ROOT}" STREQUAL "") diff --git a/cmake/configs/qurt_sdflight_legacy.cmake b/cmake/configs/qurt_sdflight_legacy.cmake index 431c907b62..3cfa61f76f 100644 --- a/cmake/configs/qurt_sdflight_legacy.cmake +++ b/cmake/configs/qurt_sdflight_legacy.cmake @@ -1,3 +1,6 @@ +include(common/px4_git) +px4_add_git_submodule(TARGET git_cmake_hexagon PATH "cmake/cmake_hexagon") + include(qurt/px4_impl_qurt) if ("$ENV{HEXAGON_SDK_ROOT}" STREQUAL "")