From 5c31630155a1166448081fa77fdbf6cc98015e39 Mon Sep 17 00:00:00 2001 From: "michal.szwaj" Date: Sat, 17 Mar 2018 21:47:10 +0100 Subject: [PATCH] Add btservice to the project --- CMakeLists.txt | 21 ++++++++++++++++++--- include/f1x/openauto/Common/Log.hpp | 2 +- src/btservice/btservice.cpp | 4 ++++ 3 files changed, 23 insertions(+), 4 deletions(-) create mode 100644 src/btservice/btservice.cpp diff --git a/CMakeLists.txt b/CMakeLists.txt index 773c143..cf4f326 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -62,10 +62,13 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR} link_directories(${CMAKE_LIBRARY_OUTPUT_DIRECTORY}) -set(autoapp_sources_directory ${sources_directory}/autoapp) -file(GLOB_RECURSE source_files ${autoapp_sources_directory}/*.ui ${autoapp_sources_directory}/*.cpp ${include_directory}/*.hpp ${resources_directory}/*.qrc) +set(common_include_directory ${include_directory}/f1x/openauto/Common) -add_executable(autoapp ${source_files}) +set(autoapp_sources_directory ${sources_directory}/autoapp) +set(autoapp_include_directory ${include_directory}/f1x/openauto/autoapp) +file(GLOB_RECURSE autoapp_source_files ${autoapp_sources_directory}/*.ui ${autoapp_sources_directory}/*.cpp ${autoapp_include_directory}/*.hpp ${common_include_directory}/*.hpp ${resources_directory}/*.qrc) + +add_executable(autoapp ${autoapp_source_files}) target_link_libraries(autoapp ${Boost_LIBRARIES} @@ -79,3 +82,15 @@ target_link_libraries(autoapp ${WINSOCK2_LIBRARIES} ${AASDK_PROTO_LIBRARIES} ${AASDK_LIBRARIES}) + +set(btservice_sources_directory ${sources_directory}/btservice) +set(btservice_include_directory ${include_directory}/f1x/openauto/btservice) +file(GLOB_RECURSE btservice_source_files ${btservice_sources_directory}/*.cpp ${btservice_include_directory}/*.hpp ${common_include_directory}/*.hpp) + +add_executable(btservice ${btservice_source_files}) + +target_link_libraries(btservice + ${Boost_LIBRARIES} + ${Qt5Bluetooth_LIBRARIES} + ${PROTOBUF_LIBRARIES} + ${AASDK_PROTO_LIBRARIES}) diff --git a/include/f1x/openauto/Common/Log.hpp b/include/f1x/openauto/Common/Log.hpp index f0f544a..4215961 100644 --- a/include/f1x/openauto/Common/Log.hpp +++ b/include/f1x/openauto/Common/Log.hpp @@ -20,4 +20,4 @@ #include -#define OPENAUTO_LOG(severity) BOOST_LOG_TRIVIAL(severity) << "[AaApp] " +#define OPENAUTO_LOG(severity) BOOST_LOG_TRIVIAL(severity) << "[OpenAuto] " diff --git a/src/btservice/btservice.cpp b/src/btservice/btservice.cpp new file mode 100644 index 0000000..905869d --- /dev/null +++ b/src/btservice/btservice.cpp @@ -0,0 +1,4 @@ +int main() +{ + return 0; +}