dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

cmake: include lockstep_scheduler test 

This makes sure we add the lockstep_scheduler_test even if the
ENABLE_LOCKSTEP_SCHEDULER is not set to yes. This means the
lockstep_scheduler is not used for SITL but the CMakeLists.txt file
still used and the test added.
This commit is contained in:
Julian Oes 2019-05-16 10:54:21 +02:00 committed by Daniel Agar
parent 8d8799097d
commit 52099f5792
2 changed files with 11 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
platforms/posix/src/CMakeLists.txt
View File

@ -31,9 +31,8 @@
#
############################################################################
if (ENABLE_LOCKSTEP_SCHEDULER)
add_subdirectory(lockstep_scheduler)
endif()
add_subdirectory(px4_daemon)
add_subdirectory(px4_layer)
add_subdirectory(lockstep_scheduler)

40
platforms/posix/src/lockstep_scheduler/CMakeLists.txt
View File

@ -1,41 +1,13 @@
cmake_minimum_required(VERSION 2.8.12)
if(NOT PROJECT_NAME STREQUAL "px4")
project(lockstep_scheduler)
set (CMAKE_CXX_STANDARD 11)
add_definitions(-DUNIT_TESTS)
add_library(lockstep_scheduler
# We want to test the lockstep schedule even if it is not used otherwise.
add_library(lockstep_scheduler
src/lockstep_scheduler.cpp
)
)
target_include_directories(lockstep_scheduler
PUBLIC
$<INSTALL_INTERFACE:include>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/src
)
target_link_libraries(lockstep_scheduler
pthread
)
target_compile_options(lockstep_scheduler PRIVATE -Wall -Wextra -Werror -O2)
add_subdirectory(test)
else()
add_library(lockstep_scheduler
src/lockstep_scheduler.cpp
)
target_include_directories(lockstep_scheduler
target_include_directories(lockstep_scheduler
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/include
)
)
endif()
px4_add_gtest(SRC test/src/lockstep_scheduler_test.cpp LINKLIBS lockstep_scheduler)