From 97d7925431f986e3b4806c2c672136f19a7df3fb Mon Sep 17 00:00:00 2001 From: Julian Oes Date: Thu, 24 Oct 2019 11:32:03 +0200 Subject: [PATCH] mavsdk_tests: add to PX4 Makefile/CMakeLists.txt --- CMakeLists.txt | 6 ++++++ Makefile | 4 ++++ mavsdk_tests/CMakeLists.txt | 7 +++---- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6d70a4577a..28be0b54c2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -386,6 +386,12 @@ add_custom_target(test_results WORKING_DIRECTORY ${PX4_BINARY_DIR}) set_target_properties(test_results PROPERTIES EXCLUDE_FROM_ALL TRUE) +# Integration testing using MAVSDK +option(MAVSDK_TESTING "Integration testing using MAVSDK" OFF) +if (MAVSDK_TESTING) + add_subdirectory(mavsdk_tests) +endif() + #============================================================================= # subdirectories # diff --git a/Makefile b/Makefile index 779f7e7d9d..95578edb16 100644 --- a/Makefile +++ b/Makefile @@ -141,6 +141,10 @@ else endif +ifdef PX4_MAVSDK_TESTING + CMAKE_ARGS += -DMAVSDK_TESTING=ON +endif + # Functions # -------------------------------------------------------------------- # describe how to build a cmake config diff --git a/mavsdk_tests/CMakeLists.txt b/mavsdk_tests/CMakeLists.txt index 903e125b1a..e20315e226 100644 --- a/mavsdk_tests/CMakeLists.txt +++ b/mavsdk_tests/CMakeLists.txt @@ -1,9 +1,5 @@ cmake_minimum_required(VERSION 3.5.1) -project(test_mission_multicopter) - -add_definitions("-std=c++17 -Wall -Wextra -Werror") - find_package(MAVSDK REQUIRED) add_executable(test_mission_multicopter @@ -18,3 +14,6 @@ target_link_libraries(test_mission_multicopter MAVSDK::mavsdk_mission MAVSDK::mavsdk_telemetry ) + +target_compile_options(test_mission_multicopter + PRIVATE -std=c++17 -Wall -Wextra -Werror)