From 241147061ed43e22c4a28548d2a9187c4f409ece Mon Sep 17 00:00:00 2001 From: Romain Forlot Date: Wed, 12 Jul 2017 17:42:16 +0200 Subject: [PATCH] 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 --- conf.d/cmake/config.cmake | 2 -- low-can-binding/CMakeLists.txt | 3 ++- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake index 9d7e97df..3f36105f 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($<$:-std=c++11>) add_compile_options($<$:-pthread>) # Customize link option diff --git a/low-can-binding/CMakeLists.txt b/low-can-binding/CMakeLists.txt index cd38fca3..fd68e6cf 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) -- 2.16.6