summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRomain Forlot <romain.forlot@iot.bzh>2017-07-12 17:42:16 +0200
committerRomain Forlot <romain.forlot@iot.bzh>2017-07-21 12:02:10 +0200
commit241147061ed43e22c4a28548d2a9187c4f409ece (patch)
tree17f22654f817c53107f2a0b3117d8d0aa35db955
parent38f9b3de40b1d1d8e9ed5db0fee40bdaa763d577 (diff)
Fix: compile error initializing afb_auth struct.
std=c++11 isn't needed. Added new class to the build and comment an other that isn't used. Change-Id: Ic32dead5e1ab55e0405f5e70224e4dad2c066116 Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
-rw-r--r--conf.d/cmake/config.cmake2
-rw-r--r--low-can-binding/CMakeLists.txt3
2 files changed, 2 insertions, 3 deletions
diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake
index 9d7e97d..3f36105 100644
--- a/conf.d/cmake/config.cmake
+++ b/conf.d/cmake/config.cmake
@@ -67,9 +67,7 @@ set (PKG_REQUIRED_LIST
# Static constante definition
# -----------------------------
-add_compile_options(-D_REENTRANT)
add_compile_options(-DPB_FIELD_16BIT)
-add_compile_options($<$<COMPILE_LANGUAGE:CXX>:-std=c++11>)
add_compile_options($<$<COMPILE_LANGUAGE:CXX>:-pthread>)
# Customize link option
diff --git a/low-can-binding/CMakeLists.txt b/low-can-binding/CMakeLists.txt
index cd38fca..fd68e6c 100644
--- a/low-can-binding/CMakeLists.txt
+++ b/low-can-binding/CMakeLists.txt
@@ -24,6 +24,7 @@ PROJECT_TARGET_ADD(low-can)
add_library(${TARGET_NAME} MODULE
binding/${TARGET_NAME}-hat.cpp
binding/${TARGET_NAME}-cb.cpp
+ binding/${TARGET_NAME}-socket.cpp
binding/${TARGET_NAME}-subscription.cpp
binding/application.cpp
binding/application-generated.cpp
@@ -40,7 +41,7 @@ PROJECT_TARGET_ADD(low-can)
utils/openxc-utils.cpp
utils/timer.cpp
utils/socketcan.cpp
- utils/socketcan-raw.cpp
+ #utils/socketcan-raw.cpp
utils/socketcan-bcm.cpp
utils/config-parser.cpp)