aboutsummaryrefslogtreecommitdiff
path: root/sensor
diff options
context:
space:
mode:
authorTrygve Laugstøl <trygvis@inamo.no>2015-06-30 14:37:06 +0200
committerTrygve Laugstøl <trygvis@inamo.no>2015-06-30 14:37:06 +0200
commit441cd0b11186d66493798551e1102eb246f1af9f (patch)
tree3cdb5b1dea6b782cbf59e172807f9dc15e7bd418 /sensor
parentaf63bd5688731b57551ac161c0dad26a0b4557d7 (diff)
downloadble-toys-441cd0b11186d66493798551e1102eb246f1af9f.tar.gz
ble-toys-441cd0b11186d66493798551e1102eb246f1af9f.tar.bz2
ble-toys-441cd0b11186d66493798551e1102eb246f1af9f.tar.xz
ble-toys-441cd0b11186d66493798551e1102eb246f1af9f.zip
Getting started on a port to OSX.
Diffstat (limited to 'sensor')
-rw-r--r--sensor/CMakeLists.txt8
-rw-r--r--sensor/include/trygvis/sensor.h1
2 files changed, 6 insertions, 3 deletions
diff --git a/sensor/CMakeLists.txt b/sensor/CMakeLists.txt
index d571e38..fb118d1 100644
--- a/sensor/CMakeLists.txt
+++ b/sensor/CMakeLists.txt
@@ -5,10 +5,12 @@ add_library(trygvis-sensor
main/io.cpp
${INCLUDES})
-include_directories("${PROJECT_SOURCE_DIR}/json/src")
-include_directories(include)
-
# Boost
find_package(Boost COMPONENTS regex system REQUIRED)
+target_include_directories(trygvis-sensor
+ PUBLIC "${PROJECT_SOURCE_DIR}/json/src"
+ PUBLIC "${PROJECT_SOURCE_DIR}/sensor/include"
+ PUBLIC "${Boost_INCLUDE_DIRS}")
+
add_subdirectory(test)
diff --git a/sensor/include/trygvis/sensor.h b/sensor/include/trygvis/sensor.h
index b5199e2..e78d845 100644
--- a/sensor/include/trygvis/sensor.h
+++ b/sensor/include/trygvis/sensor.h
@@ -4,6 +4,7 @@
#include <string>
#include <iostream>
#include <memory>
+#include <vector>
#include <boost/optional/optional.hpp>
namespace trygvis {