From 6ac0eabb5a0cb8c0a6e9c617ba9d6450872f4abb Mon Sep 17 00:00:00 2001 From: Mark Charlebois Date: Tue, 24 May 2016 14:39:17 -0700 Subject: [PATCH] Changes required to support Hexagon SDK 3.0 The inc and lib directories were renamed to incs and libs. This requires an updated cmake_hexagon and come changes to qurt paths in PX4. Signed-off-by: Mark Charlebois --- cmake/cmake_hexagon | 2 +- cmake/configs/qurt_eagle_travis.cmake | 2 +- src/modules/muorb/krait/CMakeLists.txt | 8 ++++---- src/platforms/qurt/px4_layer/CMakeLists.txt | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cmake/cmake_hexagon b/cmake/cmake_hexagon index 77d487dc07..e099d1f31d 160000 --- a/cmake/cmake_hexagon +++ b/cmake/cmake_hexagon @@ -1 +1 @@ -Subproject commit 77d487dc076a8519f81a335a5e4a2040799790de +Subproject commit e099d1f31de5091e47e54b4215a1680815aa013d diff --git a/cmake/configs/qurt_eagle_travis.cmake b/cmake/configs/qurt_eagle_travis.cmake index eee24eda15..f2e8d494e0 100644 --- a/cmake/configs/qurt_eagle_travis.cmake +++ b/cmake/configs/qurt_eagle_travis.cmake @@ -15,7 +15,7 @@ else() set(HEXAGON_SDK_ROOT $ENV{HEXAGON_SDK_ROOT}) endif() -include_directories(${HEXAGON_SDK_ROOT}/lib/common/qurt/ADSPv5MP/include) +include_directories(${HEXAGON_SDK_ROOT}/libs/common/qurt/ADSPv5MP/include) set(config_generate_parameters_scope ALL) diff --git a/src/modules/muorb/krait/CMakeLists.txt b/src/modules/muorb/krait/CMakeLists.txt index fe4c509303..b9e054e3e7 100644 --- a/src/modules/muorb/krait/CMakeLists.txt +++ b/src/modules/muorb/krait/CMakeLists.txt @@ -30,11 +30,11 @@ # POSSIBILITY OF SUCH DAMAGE. # ############################################################################ +set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/cmake_hexagon") +include(hexagon_sdk) + include_directories(${CMAKE_BINARY_DIR}/src/firmware/posix) -include_directories( - ${HEXAGON_SDK_ROOT}/inc/stddef - ${HEXAGON_SDK_ROOT}/lib/common/rpcmem - ) +include_directories(${HEXAGON_SDK_INCLUDES}) px4_add_module( MODULE modules__muorb__krait diff --git a/src/platforms/qurt/px4_layer/CMakeLists.txt b/src/platforms/qurt/px4_layer/CMakeLists.txt index 6196d1d43f..283f31d761 100644 --- a/src/platforms/qurt/px4_layer/CMakeLists.txt +++ b/src/platforms/qurt/px4_layer/CMakeLists.txt @@ -31,7 +31,7 @@ # ############################################################################ -include_directories(${HEXAGON_SDK_ROOT}/lib/common/qurt/ADSPv5MP/include) +include_directories(${HEXAGON_SDK_ROOT}/libs/common/qurt/ADSPv5MP/include) set(QURT_LAYER_SRCS px4_qurt_impl.cpp