cmake: Fix remaining compile issues
This commit is contained in:
+7
-3
@@ -52,7 +52,7 @@ endif()
|
|||||||
|
|
||||||
# Define Project
|
# Define Project
|
||||||
project(
|
project(
|
||||||
DataPath
|
datapath
|
||||||
VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}.${VERSION_TWEAK}
|
VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}.${VERSION_TWEAK}
|
||||||
)
|
)
|
||||||
set(PROJECT_FULL_NAME "DataPath IPC Library")
|
set(PROJECT_FULL_NAME "DataPath IPC Library")
|
||||||
@@ -279,8 +279,12 @@ endif()
|
|||||||
|
|
||||||
# Includes
|
# Includes
|
||||||
target_include_directories(${PROJECT_NAME}
|
target_include_directories(${PROJECT_NAME}
|
||||||
PRIVATE "source"
|
INTERFACE
|
||||||
PUBLIC "include"
|
"${PROJECT_SOURCE_DIR}/include"
|
||||||
|
PUBLIC
|
||||||
|
"${PROJECT_SOURCE_DIR}/include"
|
||||||
|
PRIVATE
|
||||||
|
"${PROJECT_SOURCE_DIR}/source"
|
||||||
)
|
)
|
||||||
|
|
||||||
# Defines
|
# Defines
|
||||||
|
|||||||
+1
-1
@@ -33,7 +33,7 @@ namespace datapath {
|
|||||||
* @param std::shared_ptr<datapath::isocket> Socket.
|
* @param std::shared_ptr<datapath::isocket> Socket.
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
datapath::event<bool&, std::shared_ptr<datapath::isocket>> _on_accept;
|
datapath::event<bool&, std::shared_ptr<datapath::isocket>> on_accept;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
virtual datapath::error close() = 0;
|
virtual datapath::error close() = 0;
|
||||||
|
|||||||
+2
-2
@@ -24,9 +24,9 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|||||||
namespace datapath {
|
namespace datapath {
|
||||||
class isocket {
|
class isocket {
|
||||||
public /*events*/:
|
public /*events*/:
|
||||||
datapath::event<const std::vector<char>&> _on_message;
|
datapath::event<const std::vector<char>&> on_message;
|
||||||
|
|
||||||
datapath::event<> _on_close;
|
datapath::event<> on_close;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
virtual bool good() = 0;
|
virtual bool good() = 0;
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|||||||
#include <string>
|
#include <string>
|
||||||
#include <thread>
|
#include <thread>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#include "datapath.hpp"
|
#include <datapath.hpp>
|
||||||
#include "measurer.hpp"
|
#include "measurer.hpp"
|
||||||
|
|
||||||
static auto log_time = std::chrono::high_resolution_clock::now();
|
static auto log_time = std::chrono::high_resolution_clock::now();
|
||||||
|
|||||||
Reference in New Issue
Block a user