From 02e3f28d87d5b7fc7f444ed86759f2a7652b4d79 Mon Sep 17 00:00:00 2001 From: Mark Charlebois Date: Tue, 24 May 2016 16:32:34 -0700 Subject: [PATCH] Added back support for SDK 2.0 as well as 3.0 Signed-off-by: Mark Charlebois --- cmake/cmake_hexagon | 2 +- cmake/configs/qurt_eagle_travis.cmake | 2 +- src/platforms/qurt/px4_layer/CMakeLists.txt | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/cmake/cmake_hexagon b/cmake/cmake_hexagon index e099d1f31d..f5722e906c 160000 --- a/cmake/cmake_hexagon +++ b/cmake/cmake_hexagon @@ -1 +1 @@ -Subproject commit e099d1f31de5091e47e54b4215a1680815aa013d +Subproject commit f5722e906c85fe2311c37f0833dff3f7c2f6e5cc diff --git a/cmake/configs/qurt_eagle_travis.cmake b/cmake/configs/qurt_eagle_travis.cmake index f2e8d494e0..8f135098b8 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}/libs/common/qurt/ADSPv5MP/include) +include_directories(${HEXAGON_8074_INCLUDES}) set(config_generate_parameters_scope ALL) diff --git a/src/platforms/qurt/px4_layer/CMakeLists.txt b/src/platforms/qurt/px4_layer/CMakeLists.txt index 283f31d761..38dbd8a46f 100644 --- a/src/platforms/qurt/px4_layer/CMakeLists.txt +++ b/src/platforms/qurt/px4_layer/CMakeLists.txt @@ -30,8 +30,10 @@ # POSSIBILITY OF SUCH DAMAGE. # ############################################################################ +set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/cmake_hexagon") +include(hexagon_sdk) -include_directories(${HEXAGON_SDK_ROOT}/libs/common/qurt/ADSPv5MP/include) +include_directories(${HEXAGON_8074_INCLUDES}) set(QURT_LAYER_SRCS px4_qurt_impl.cpp