From 14cb09595d99a32164a893438b217d4f671a84b8 Mon Sep 17 00:00:00 2001
From: Jan de Cuveland <cuveland@compeng.uni-frankfurt.de>
Date: Wed, 12 Jun 2024 23:22:38 +0200
Subject: [PATCH] Fix build flow for updated flesnet
---
external/InstallFlesnet.cmake | 8 +++++---
fles/mcbm2018/CbmMcbm2018MsCrcCheck.h | 2 +-
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/external/InstallFlesnet.cmake b/external/InstallFlesnet.cmake
index d4bc21b7b5..3a3674bcd9 100644
--- a/external/InstallFlesnet.cmake
+++ b/external/InstallFlesnet.cmake
@@ -73,6 +73,7 @@ set_target_properties(external::zmq PROPERTIES
target_include_directories(external::zmq INTERFACE
${FLESNET_DESTDIR}/src/flesnet-build/src/zeromq/include
)
+target_compile_definitions(external::zmq INTERFACE ZMQ_BUILD_DRAFT_API=1)
add_library(external::fles_logging STATIC IMPORTED GLOBAL)
add_dependencies(external::fles_logging flesnet)
@@ -140,18 +141,19 @@ endif()
if(APPLE AND Boost_VERSION LESS 1.80.0)
set_target_properties(external::fles_ipc PROPERTIES
IMPORTED_LOCATION ${FLESNET_DESTDIR}/src/flesnet-build/lib/fles_ipc/${CMAKE_STATIC_LIBRARY_PREFIX}fles_ipc${CMAKE_STATIC_LIBRARY_SUFFIX}
- INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_SOURCE_DIR}/flesnet/lib/fles_ipc
IMPORTED_LINK_INTERFACE_LIBRARIES "${dir_to_link}"
INTERFACE_LINK_DIRECTORIES "/usr/local/lib"
)
else ()
set_target_properties(external::fles_ipc PROPERTIES
IMPORTED_LOCATION ${FLESNET_DESTDIR}/src/flesnet-build/lib/fles_ipc/${CMAKE_STATIC_LIBRARY_PREFIX}fles_ipc${CMAKE_STATIC_LIBRARY_SUFFIX}
- INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_SOURCE_DIR}/flesnet/lib/fles_ipc
IMPORTED_LINK_INTERFACE_LIBRARIES "${dir_to_link}"
)
endif()
-
+target_include_directories(external::fles_ipc INTERFACE
+ ${CMAKE_CURRENT_SOURCE_DIR}/flesnet/lib/fles_ipc
+ ${CMAKE_CURRENT_SOURCE_DIR}/flesnet/lib/shm_ipc
+)
diff --git a/fles/mcbm2018/CbmMcbm2018MsCrcCheck.h b/fles/mcbm2018/CbmMcbm2018MsCrcCheck.h
index 7da417232f..5e272d8d7a 100644
--- a/fles/mcbm2018/CbmMcbm2018MsCrcCheck.h
+++ b/fles/mcbm2018/CbmMcbm2018MsCrcCheck.h
@@ -12,7 +12,7 @@
#ifndef CBMMCBM2018MSCRCCHECK_H
#define CBMMCBM2018MSCRCCHECK_H
-#include "TimesliceSubscriber.hpp"
+#include "TimesliceSource.hpp"
#include "TList.h"
#include "TObjString.h"
--
GitLab