From ffb8bb60667b76be69664126d015a12c2196cba6 Mon Sep 17 00:00:00 2001
From: Matthias Grob <maetugr@gmail.com>
Date: Fri, 1 Feb 2019 10:26:36 +0100
Subject: [PATCH] lockstep_scheduler: correct cmake target includes
---
platforms/posix/src/lockstep_scheduler/CMakeLists.txt | 5 +++--
.../posix/src/lockstep_scheduler/src/lockstep_scheduler.cpp | 2 +-
platforms/posix/src/px4_layer/CMakeLists.txt | 1 -
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/platforms/posix/src/lockstep_scheduler/CMakeLists.txt b/platforms/posix/src/lockstep_scheduler/CMakeLists.txt
index 47cc06962e..fa7443b191 100644
--- a/platforms/posix/src/lockstep_scheduler/CMakeLists.txt
+++ b/platforms/posix/src/lockstep_scheduler/CMakeLists.txt
@@ -33,8 +33,9 @@ else()
add_library(lockstep_scheduler
src/lockstep_scheduler.cpp
)
- include_directories(
- include
+ target_include_directories(lockstep_scheduler
+ PUBLIC
+ ${CMAKE_CURRENT_SOURCE_DIR}/include
)
endif()
diff --git a/platforms/posix/src/lockstep_scheduler/src/lockstep_scheduler.cpp b/platforms/posix/src/lockstep_scheduler/src/lockstep_scheduler.cpp
index f13e93d662..87479e263b 100644
--- a/platforms/posix/src/lockstep_scheduler/src/lockstep_scheduler.cpp
+++ b/platforms/posix/src/lockstep_scheduler/src/lockstep_scheduler.cpp
@@ -1,4 +1,4 @@
-#include "lockstep_scheduler/lockstep_scheduler.h"
+#include <lockstep_scheduler/lockstep_scheduler.h>
LockstepScheduler::~LockstepScheduler()
{
diff --git a/platforms/posix/src/px4_layer/CMakeLists.txt b/platforms/posix/src/px4_layer/CMakeLists.txt
index 4df54c1545..85f8bd9d90 100644
--- a/platforms/posix/src/px4_layer/CMakeLists.txt
+++ b/platforms/posix/src/px4_layer/CMakeLists.txt
@@ -59,7 +59,6 @@ target_link_libraries(px4_layer PRIVATE px4_daemon)
if(ENABLE_LOCKSTEP_SCHEDULER)
target_link_libraries(px4_layer PRIVATE lockstep_scheduler)
- include_directories(${PX4_SOURCE_DIR}/platforms/posix/src/lockstep_scheduler/include)
endif()
--
GitLab