переделки для того, чтобы библиотека api заводилась
This commit is contained in:
2
dependencies/control_system/CMakeLists.txt
vendored
2
dependencies/control_system/CMakeLists.txt
vendored
@@ -28,6 +28,8 @@ add_library(terminal-client-api SHARED
|
||||
client/system_client.cpp
|
||||
)
|
||||
|
||||
target_include_directories(terminal-client-api PUBLIC "include/")
|
||||
|
||||
find_package(Boost 1.53.0 COMPONENTS system log log_setup REQUIRED)
|
||||
find_package(cereal REQUIRED)
|
||||
target_link_libraries(terminal-client-api ${Boost_LIBRARIES} ${OPENSSL_LIBRARIES} cereal::cereal)
|
||||
|
2
dependencies/control_system/client/main.cpp
vendored
2
dependencies/control_system/client/main.cpp
vendored
@@ -1,5 +1,5 @@
|
||||
#include <shared_mutex>
|
||||
#include "ControlProtoCInterface.h"
|
||||
#include "terminal_api/ControlProtoCInterface.h"
|
||||
#include "system_client.h"
|
||||
|
||||
std::shared_mutex mtx;
|
||||
|
@@ -1,13 +1,14 @@
|
||||
#ifndef __CONTROL_PROTO_COMMANDS__
|
||||
#define __CONTROL_PROTO_COMMANDS__
|
||||
|
||||
#include <stdint.h>
|
||||
#include <iostream>
|
||||
#include <string>
|
||||
|
||||
#ifdef __cplusplus
|
||||
#include <cstdint>
|
||||
#define EXTERNC extern "C"
|
||||
#else
|
||||
#include <stdint.h>
|
||||
#define EXTERNC extern
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user